Skip to content

Commit 6e6610e

Browse files
committed
python3Packages.patool: local backport of file regression fix
1 parent 8422db6 commit 6e6610e

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

pkgs/development/python-modules/patool/default.nix

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
1-
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
1+
{ lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip,
22
cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file,
33
gzip, bzip2, xz}:
44

55
# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar)
66
# it will still use unrar if present in the path
77

88
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+
920
compression-utilities = [
1021
p7zip
1122
gnutar
@@ -17,7 +28,7 @@ let
1728
gnugrep
1829
diffutils
1930
bzip2
20-
file
31+
file'
2132
xz
2233
];
2334
in

0 commit comments

Comments
 (0)