philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/nixos/modules
History
Vladimír Čunát e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
config Merge recent master into staging 2014-08-30 10:04:02 +02:00
hardware
installer Merge recent master into staging 2014-08-30 10:04:02 +02:00
misc dnsmasq: upgrade to 2.71, fixed dnsmasq module 2014-08-28 11:39:03 -07:00
profiles Merge recent master into staging 2014-08-30 10:04:02 +02:00
programs Merge pull request #3275 from taku0/gtk-env 2014-08-29 01:35:38 +04:00
security Don't silently ignore errors from the activation script 2014-08-15 02:14:34 +02:00
services Merge pull request #3745 from wkennington/master.dnsmasq 2014-08-29 01:43:41 +04:00
system nixos/install-grub: Check /boot against /nix/store instead of /nix 2014-08-28 13:35:37 -07:00
tasks Enable grub zfsSupport if zfs is built into the initrd 2014-08-28 13:35:34 -07:00
testing Fix evaluation 2014-08-06 19:44:13 +02:00
virtualisation Merge recent master into staging 2014-08-30 10:04:02 +02:00
module-list.nix Merge pull request #3275 from taku0/gtk-env 2014-08-29 01:35:38 +04:00
rename.nix