Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" ...

This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing
changes made to 0078bc5d8f87512104902eab00c8a44bef286067.

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

..

btrfs.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

cifs.nix

Move CIFS support into a separate module

2014-07-30 12:39:35 +02:00

ext.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

f2fs.nix

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

nfs.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

reiserfs.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

unionfs-fuse.nix

Mount unionfs-fuse filesystems using the normal fileSystems option

2014-07-30 16:04:15 +02:00

vfat.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

xfs.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

zfs.nix

Revert "Merge pull request #2449 from wkennington/master.grub"

2014-08-31 12:58:37 +04:00