Domen Kožar bb4d658f64 Merge branch 'master' into staging ... Conflicts: nixos/doc/manual/release-notes/rl-unstable.xml nixos/modules/services/printing/cupsd.nix pkgs/applications/misc/calibre/default.nix pkgs/development/haskell-modules/hackage-packages.nix pkgs/development/libraries/libsodium/default.nix pkgs/misc/emulators/wine/unstable.nix pkgs/top-level/all-packages.nix		2015-05-11 10:05:23 +02:00
..
config	Remove sysvtools from the system path	2015-04-20 11:33:42 +02:00
hardware	nvidia: 346.47 -> 346.59	2015-04-07 13:24:55 -07:00
installer	Merge pull request #7601 from cstrahan/iso-name-fix	2015-05-04 10:24:38 +02:00
misc	Sane default configuration for sabnzbd module	2015-05-05 00:18:22 -04:00
profiles	nixos.system_tarball_pc: Fix evaluation	2015-04-28 17:15:02 +02:00
programs	Use "mkdir -p" when creating ~/.nix-defexpr	2015-04-20 13:03:04 +02:00
security	grsecurity: Update stable and test patches	2015-05-11 02:45:38 +02:00
services	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
system	Revert "Making nixos keep a ref to its stdenv"	2015-05-09 21:11:49 +00:00
tasks	Typo	2015-04-20 16:12:28 +02:00
testing	test-instrumentation.nix: Prevent calling a pager	2015-01-15 14:39:29 +01:00
virtualisation	Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared.	2015-05-07 08:51:38 +00:00
module-list.nix	Merge pull request #7565 from offlinehacker/nixos/confd/module	2015-05-02 14:43:02 +02:00
rename.nix	Make environment.checkConfigurationOptions an alias	2015-04-10 16:11:07 +02:00