diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/grub')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 9 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/misc/grub/trusted.nix | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index ec1c5897ed79..7e30ffe0b288 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -31,7 +31,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04-rc1"; + version = "2.04"; in ( @@ -40,12 +40,13 @@ assert zfsSupport -> zfs != null; assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { - name = "grub-${version}"; + pname = "grub"; + inherit version; src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = name; - sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; + rev = "${pname}-${version}"; + sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/nixpkgs/pkgs/tools/misc/grub/trusted.nix index ca4e477adce7..7b432df3e8b8 100644 --- a/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -29,7 +29,8 @@ let in stdenv.mkDerivation rec { - name = "trustedGRUB2-${version}"; + pname = "trustedGRUB2"; + inherit version; src = if for_HP_laptop then fetchgit { |