From 267d1078640875577eb44fc1e1de7605d2a34ca6 Mon Sep 17 00:00:00 2001 From: Christian Theune Date: Fri, 30 Jan 2026 00:50:37 +0100 Subject: [PATCH 1/2] grub: add patches to help getting out of xfs corners Re FC-51697 --- pkgs/tools/misc/grub/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index aa119dac9e8a4..8b3246d9c8572 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -583,6 +583,26 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ac1512b872af8567b408518a7efa01607a0219ae"; hash = "sha256-deyp6Yatlgv86bYMt7WcWhKg8J6StDPUEy4UPHqJYIc="; }) + (fetchpatch { + name = "xfs-non-continuous-data-blocks.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=68dd65cfdaad08b1f8ec01b84949b0bf88bc0d8c"; + hash = "sha256-KWdOJhsWmUIOj66SrIYhZvpnshDSpfzaEKZOSXjIs1E="; + }) + (fetchpatch { + name = "xfs-superblock.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1ed2628b560cedac7fd1a696985ab85b24541a8e"; + hash = "sha256-ijeEzqHhrPU12iWF4Os8S3paCAR0gQ+W4JAIV5dH0jw="; + }) + (fetchpatch { + name = "xfs-iterate-dir.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f209887381a56dea79152ab26ffb485718e3218e"; + hash = "sha256-3qWfGxQg7pndeseIcQn3uPj23cGJWyuP5dG4eDQearU="; + }) + (fetchpatch { + name = "xfs-large-extent.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4abac0ad5a7914dd3cdfff08aaac06588bf98d80"; + hash = "sha256-SActYcUgGRNoAtmpUOSas2JRdWtg7sLovh4BtZRmFUc="; + }) ]; postPatch = From b8878ddf8a9195decd729c1e27bb28e168b45084 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Fri, 30 Jan 2026 10:03:38 +0100 Subject: [PATCH 2/2] grub2: bump version to triger re-install According to install-grub.pl, grub files are only updated (re-installed) when the package name or version changes. So we update the patch level. --- pkgs/tools/misc/grub/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 8b3246d9c8572..18721871fc6ce 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -109,7 +109,7 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation rec { pname = "grub"; - version = "2.12"; + version = "2.12.1"; src = fetchgit { url = "https://git.savannah.gnu.org/git/grub.git";