Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" ... This reverts commit 469f22d717, reversing changes made to 0078bc5d8f. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.		2014-08-31 12:58:37 +04:00
..
config	nixos/users-groups: Fix eval on missing uid/gid.	2014-08-29 07:17:19 +02:00
hardware	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00
installer	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
misc	Merge pull request #3773 from nbp/nixos-maintainers	2014-08-29 14:57:20 +02:00
profiles	initrd.availableKernelModules: add support for keyboards	2014-08-12 20:00:01 +02:00
programs	Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes	2014-08-30 07:33:38 -07:00
security	Don't silently ignore errors from the activation script	2014-08-15 02:14:34 +02:00
services	Add extraConfig option for SLiM	2014-08-31 03:21:37 +02:00
system	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
tasks	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
testing	Fix evaluation	2014-08-06 19:44:13 +02:00
virtualisation	nixos-container run: Execute command using ‘su’	2014-08-28 02:20:31 +02:00
module-list.nix	Merge pull request #3773 from nbp/nixos-maintainers	2014-08-29 14:57:20 +02:00
rename.nix	Remove the option ‘programs.bash.enable’	2014-04-29 19:00:39 +02:00