diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index cce2adf5ce5..a187dd9d6b2 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}: stdenv.mkDerivation { - name = "grub-0.97-patch-1.10"; + name = "grub-0.97-patch-1.12"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; @@ -13,8 +13,8 @@ stdenv.mkDerivation { # failures on systems with more than 2 GiB RAM, and for booting from # ext3 filesystems with 256-byte inodes as well as ext4 filesystems. gentooPatches = fetchurl { - url = mirror://gentoo/distfiles/grub-0.97-patches-1.10.tar.bz2; - sha256 = "015hkmb2jd6jfzkfr13cdh16frvva04rwr4yahzyw5xhl634d1h9"; + url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2; + sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0"; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f051abdc871..bf504d9fbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -787,7 +787,6 @@ let grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; - automake = automake110x; }; grub19x = callPackage ../tools/misc/grub/1.9x.nix { };