diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-04-14 02:14:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 02:14:43 +0200 |
| commit | 6c203eab0160e774fd015d47bef48d7783cdf2fc (patch) | |
| tree | 98bdbfdd0924e0e3ca102b944fdb64e0be9a5ffe | |
| parent | 731f1a0ffba43a412bc1dd321d5806ebb3af0d89 (diff) | |
| parent | b03e59d4c08c00f0f66296db3eecd299c0c976d8 (diff) | |
| download | nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.tar nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.tar.gz nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.tar.bz2 nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.tar.lz nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.tar.xz nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.tar.zst nixpkgs-6c203eab0160e774fd015d47bef48d7783cdf2fc.zip | |
Merge pull request #201709 from helsinki-systems/alias-grub2
grub2_full: turn into alias
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e6e914c82db..b10d82bd397 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -635,6 +635,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 gsl_1 = throw "'gsl_1' has been renamed to/replaced by 'gsl'"; # Added 2022-11-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5884fbe359b..8e17a1b24ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8102,9 +8102,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"; @@ -8124,7 +8122,7 @@ with pkgs; zfsSupport = false; }; - grub2_xen = grub2_full.override { + grub2_xen = grub2.override { xenSupport = true; }; @@ -34071,7 +34069,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 { }; |