public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-28 13:33:13 +01:00
parent 6eb4014874 e01e92f12f
commit c7142c1aa3
18 changed files with 185 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/loader/grub/grub.nix
+1 -1
View File
@@ -500,7 +500,7 @@ in
imports =
[ (mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ])
[ (mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ] "")
(mkRenamedOptionModule [ "boot" "copyKernels" ] [ "boot" "loader" "grub" "copyKernels" ])
(mkRenamedOptionModule [ "boot" "extraGrubEntries" ] [ "boot" "loader" "grub" "extraEntries" ])
(mkRenamedOptionModule [ "boot" "extraGrubEntriesBeforeNixos" ] [ "boot" "loader" "grub" "extraEntriesBeforeNixOS" ])