python3Packages.patool: local backport of file regression fix

NixOS · Feb 14, 2023 · 6e6610e · 6e6610e
1 parent 8422db6
commit 6e6610e
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix
@@ -1,11 +1,22 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
+{ lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip,
   cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file,
   gzip, bzip2, xz}:
 
 # unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar)
 # it will still use unrar if present in the path
 
 let
+  # FIXME: backport a patch in `file` that seemingly only affects this package
+  # Revert when fix to main package makes it through staging.
+  file' = file.overrideAttrs(old: {
+    patches = (old.patches or []) ++ [
+      (fetchurl {
+        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/file/files/file-5.44-decompress-empty.patch?h=dfc57da515a2aaf085bea68267cc727f1bfaa691";
+        hash = "sha256-fUzRQAlLWczBmR5iA1Gk66mHjP40MJcMdgCtm2+u1SQ=";
+      })
+    ];
+  });
+
   compression-utilities = [
     p7zip
     gnutar
@@ -17,7 +28,7 @@ let
     gnugrep
     diffutils
     bzip2
-    file
+    file'
     xz
   ];
 in