Vladimír Čunát 2090aa4f65 Merge: fixup a bad merge ... For details see: https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916		2017-04-14 19:11:17 +02:00
..
config	treewide: use boolToString function	2017-04-11 18:18:53 +02:00
hardware	rtl8192su-firmware: init at unstable-2016-10-05	2017-03-31 10:49:38 +02:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	channel.nix: Use filterSource to exclude unnecessary files from nixpkgs	2017-03-25 01:42:28 +02:00
misc	Remove static uid/gid	2017-03-18 13:54:39 +01:00
profiles	nixos: fix renaming warning in graphical profile	2017-03-03 07:27:41 -06:00
programs	sstmp: document how to specify port/AuthPassFile	2017-04-08 17:20:18 +02:00
security	acme: Add "domain" option to separate domain from name	2017-04-11 18:28:05 +02:00
services	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
system	nixos: escape brackets in systemd units	2017-04-12 15:56:26 +02:00
tasks	nixos/filesystems: skip filesystem check for bindfs (#24671)	2017-04-06 12:35:25 +01:00
testing	kdm: drop service	2017-02-11 13:55:09 -05:00
virtualisation	Merge pull request #24360 from clefru/gce-image-shrink-on-master	2017-04-10 12:01:53 +02:00
module-list.nix	Merge pull request #24008 from phile314/slimserver	2017-04-08 17:43:41 +02:00
rename.nix	nixos/fontconfig: remove renderMonoTTFAsBitmap	2017-04-03 08:24:32 -05:00