From 133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 15:17:03 +0200 Subject: [PATCH] Revert "python.pkgs.binwalk: remove p7zip from propagatedBuildInputs" This reverts commit 9a2ec56ad4587b3aa3777e6fd480980c4d51b292. p7zip is now switched to a maintained fork --- pkgs/development/python-modules/binwalk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index e8a20b6df47d..97c6b957a437 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -7,6 +7,7 @@ , gzip , bzip2 , gnutar +, p7zip , cabextract , lzma , nose @@ -28,7 +29,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test