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

grub2_full: turn into alias

Browse Source
This commit is contained in:
ajs124 2022-11-18 02:21:42 +01:00
parent 1d6d5f975d
commit b03e59d4c0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/top-level/aliases.nix
View File

@ -578,6 +578,7 @@ mapAliases ({
gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
grub2_full = grub2; # Added 2022-11-18
grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01
gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22

8
pkgs/top-level/all-packages.nix
View File

@ -7540,9 +7540,7 @@ with pkgs;
trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; };
grub2 = grub2_full;
grub2_full = callPackage ../tools/misc/grub/2.0x.nix {
grub2 = callPackage ../tools/misc/grub/2.0x.nix {
# update breaks grub2
gnulib = pkgs.gnulib.overrideAttrs (_: rec {
version = "20200223";
@ -7562,7 +7560,7 @@ with pkgs;
zfsSupport = false;
};
grub2_xen = grub2_full.override {
grub2_xen = grub2.override {
xenSupport = true;
};
@ -32394,7 +32392,7 @@ with pkgs;
timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; };
timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; };
timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2; };
timeshift-minimal = callPackage ../applications/backup/timeshift/minimal.nix { };