From bb41e2b58b5d1e632564f0366397aee836c1f2de Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 21:34:40 +0300 Subject: [PATCH] Revert "python3Packages.patool: local backport of `file` regression fix" This reverts commit 6e6610edd48f706b0eb8d8a846ea5b453d1ff28a. --- .../development/python-modules/patool/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 47ef2faea962..f23521ea2140 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchurl, pytestCheckHook, p7zip, +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file, gzip, bzip2, xz}: @@ -6,17 +6,6 @@ # 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 @@ -28,7 +17,7 @@ let gnugrep diffutils bzip2 - file' + file xz ]; in