Vladimír Čunát d957b4bd78 Merge recent master into staging ... Hydra nixpkgs: ?compare=1151601		2014-09-13 21:48:29 +02:00
..
config	Merge recent master into staging	2014-09-13 21:48:29 +02:00
hardware	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
installer	Merge recent master into staging	2014-09-13 21:48:29 +02:00
misc	Merge pull request #3811 from nbp/options-json	2014-09-07 10:39:03 -07:00
profiles	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
programs	Merge recent master into staging	2014-09-13 21:48:29 +02:00
security	Remove some setuid wrappers for non-standard programs	2014-09-05 14:46:36 +02:00
services	Merge recent master into staging	2014-09-13 21:48:29 +02:00
system	Merge remote-tracking branch 'origin/systemd-216' into staging	2014-09-08 13:53:33 +02:00
tasks	nixos/networking: Fix typo in ipv6prefixLength.	2014-09-05 02:54:39 +02:00
testing	Fix evaluation	2014-08-06 19:44:13 +02:00
virtualisation	Merge recent master into staging	2014-09-13 21:48:29 +02:00
module-list.nix	Merge recent master into staging	2014-09-13 21:48:29 +02:00
rename.nix	Remove the option ‘programs.bash.enable’	2014-04-29 19:00:39 +02:00