Merge pull request #216343 from K900/patool-hack

python3Packages.patool: local backport of `file` regression fix

authored by

K900 and committed by
GitHub
a9c9d192 8422db6f

+13 -2
+13 -2
pkgs/development/python-modules/patool/default.nix
··· 1 - { lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, 1 + { lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip, 2 2 cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file, 3 3 gzip, bzip2, xz}: 4 4 ··· 6 6 # it will still use unrar if present in the path 7 7 8 8 let 9 + # FIXME: backport a patch in `file` that seemingly only affects this package 10 + # Revert when fix to main package makes it through staging. 11 + file' = file.overrideAttrs(old: { 12 + patches = (old.patches or []) ++ [ 13 + (fetchurl { 14 + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/file/files/file-5.44-decompress-empty.patch?h=dfc57da515a2aaf085bea68267cc727f1bfaa691"; 15 + hash = "sha256-fUzRQAlLWczBmR5iA1Gk66mHjP40MJcMdgCtm2+u1SQ="; 16 + }) 17 + ]; 18 + }); 19 + 9 20 compression-utilities = [ 10 21 p7zip 11 22 gnutar ··· 17 28 gnugrep 18 29 diffutils 19 30 bzip2 20 - file 31 + file' 21 32 xz 22 33 ]; 23 34 in