grub: Update to 2.00

This commit is contained in:
Eelco Dolstra 2012-07-24 22:27:36 -04:00
parent ddb5bd38bb
commit 6262db94a9
2 changed files with 13 additions and 11 deletions

View File

@ -2,12 +2,16 @@
, EFIsupport ? false }: , EFIsupport ? false }:
let let
prefix = "grub${if EFIsupport then "-efi" else ""}";
version = "1.99"; prefix = "grub${if EFIsupport then "-efi" else ""}";
unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; version = "2.00";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
}; unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnu/grub/grub-${version}.tar.xz"; url = "mirror://gnu/grub/grub-${version}.tar.xz";
sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k"; sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
}; };
buildNativeInputs = [ flex bison ]; buildNativeInputs = [ flex bison ];

View File

@ -830,11 +830,9 @@ let
buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true;
}; };
grub19x = callPackage ../tools/misc/grub/1.9x.nix { }; grub2 = callPackage ../tools/misc/grub/2.0x.nix { };
grub2 = grub19x; grub2_efi = grub2.override { EFIsupport = true; };
grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };
gssdp = callPackage ../development/libraries/gssdp { gssdp = callPackage ../development/libraries/gssdp {
inherit (gnome) libsoup; inherit (gnome) libsoup;