1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
nixpkgs/nixos/modules/installer
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
..
cd-dvd nixos/manual: Use literalExample when feasible. 2014-08-27 23:41:15 +02:00
scan Rewrite ‘with pkgs.lib’ -> ‘with lib’ 2014-04-14 16:26:48 +02:00
tools Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04:00
virtualbox-demo.nix Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04:00