From 932c8f4c13d06ee7787e7099948eb5f926ce38dc Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 16 Sep 2018 22:47:56 -0400
Subject: grub: grub-0.97-patch-1.15 -> grub-0.97-73

Instead of using Gentoo's patchset, uses Debian's.

Gentoo's doesn't work anymore.
---
 pkgs/tools/misc/grub/default.nix | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

(limited to 'pkgs/tools/misc/grub/default.nix')

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 6ba931ad80d6..f5ba8b7fe100 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,52 +1,30 @@
 {stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}:
 
+let
+in
 stdenv.mkDerivation {
-  name = "grub-0.97-patch-1.12";
+  name = "grub-0.97-73";
 
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
     sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
   };
 
-  # Lots of patches from Gentoo, in particular splash screen support
-  # (not the fancy SUSE gfxmenu stuff though).  Also a fix for boot
-  # 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.12.tar.bz2;
-    sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0";
-  };
-
   patches = [
     # Properly handle the case of symlinks such as
     # /dev/disk/by-label/bla.  The symlink resolution code in
     # grub-install isn't smart enough.
     ./symlink.patch
-
-    # Provide support for the "savedefault --once" command in the Grub
-    # shell.  KDE uses this to allow rebooting into a non-default
-    # entry.
-    (fetchurl {
-      url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch";
-      sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8";
-    })
-
-  ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch);
+  ]
+  ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch)
+  ++ map fetchurl (import ./grub1.patches.nix)
+  ;
 
   # autoreconfHook required for the splashimage patch.
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ texinfo ];
 
-  hardeningDisable = [ "stackprotector" ];
-
-  prePatch = ''
-    unpackFile $gentooPatches
-    rm patch/400_all_grub-0.97-reiser4-20050808-gentoo.patch
-    for i in patch/*.patch; do
-      echo "applying patch $i"
-      patch -p1 < $i || patch -p0 < $i
-    done
-  '';
+  hardeningDisable = [ "format" "stackprotector" ];
 
   passthru.grubTarget = "";
 
-- 
cgit 1.4.1


From 4e7c822dc6bad757f704e3f7a522f19eea8ea2c9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 10 Oct 2018 16:25:14 -0400
Subject: grub: fetch from HTTPS instead of FTP; update meta (#48137)

HTTPS is unlikely to be worse and is often better than FTP. Aside from being
faster, there are many networking setups where outgoing FTP traffic is blocked.
---
 pkgs/tools/misc/grub/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools/misc/grub/default.nix')

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index f5ba8b7fe100..87e9814d8993 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,12 +1,10 @@
-{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}:
+{ stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }:
 
-let
-in
 stdenv.mkDerivation {
   name = "grub-0.97-73";
 
   src = fetchurl {
-    url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
+    url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
     sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
   };
 
@@ -29,6 +27,8 @@ stdenv.mkDerivation {
   passthru.grubTarget = "";
 
   meta = with stdenv.lib; {
+    homepage = https://www.gnu.org/software/grub;
+    description = "GRand Unified Bootloader";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
-- 
cgit 1.4.1