Skip to content

Commit

Permalink
Revert "python3Packages.patool: local backport of file regression fix"
Browse files Browse the repository at this point in the history
This reverts commit 6e6610e.
  • Loading branch information
K900 committed Feb 14, 2023
1 parent 2e759a9 commit bb41e2b
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions pkgs/development/python-modules/patool/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
{ lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip,
{ lib, buildPythonPackage, fetchFromGitHub, 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
Expand All @@ -28,7 +17,7 @@ let
gnugrep
diffutils
bzip2
file'
file
xz
];
in
Expand Down

0 comments on commit bb41e2b

Please sign in to comment.