util-linux: backport bcache checksum patches

In util-linux 2.39, blkid was improved to verify the checksums for
several types of block devices. In the bcache case, this calculation was
incorrect, leading to a regression where valid bcache cache devices
would not be detected any more. In some cases, this can even break the
boot because a required bcache device does not come up any more.

In https://github.com/util-linux/util-linux/pull/2293, a fix was
introduced upstream. Include these patches to make bcache detection work
properly again.

1 files changed, 10 insertions, 0 deletions

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 7b98c6bcd9d..7b4ef6ed014 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -38,6 +38,16 @@ stdenv.mkDerivation rec {
       url = "https://github.com/util-linux/util-linux/commit/1bd85b64632280d6bf0e86b4ff29da8b19321c5f.diff";
       hash = "sha256-dgu4de5ul/si7Vzwe8lr9NvsdI1CWfDQKuqvARaY6sE=";
     })
+
+    # FIXME: backport bcache detection fixes, remove in next release
+    (fetchpatch {
+      url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff";
+      hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME=";
+    })
+    (fetchpatch {
+      url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff";
+      hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8=";
+    })
   ];
 
   outputs = [ "bin" "dev" "out" "lib" "man" ];