public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95580 from flokli/binwalk-visual-entropy-graphing

Browse Source 
binwalk-full: enable visual entropy graphing (needs matplotlib)
This commit is contained in:
Florian Klink 2020-08-17 22:18:52 +02:00 committed by GitHub
commit d45c287d9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/binwalk/default.nix
View File

@ -12,12 +12,13 @@
, cramfsprogs , cramfsprogs
, cramfsswap , cramfsswap
, lzma , lzma
, matplotlib
, nose , nose
, pycrypto , pycrypto
, pyqtgraph ? null }: , pyqtgraph ? null }:
let let
visualizationSupport = (pyqtgraph != null); visualizationSupport = (pyqtgraph != null) && (matplotlib != null);
version = "2.2.0"; version = "2.2.0";
in in
buildPythonPackage { buildPythonPackage {
@ -32,7 +33,7 @@ buildPythonPackage {
}; };
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ] propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ]
++ stdenv.lib.optional visualizationSupport pyqtgraph; ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
# setup.py only installs version.py during install, not test # setup.py only installs version.py during install, not test
postPatch = '' postPatch = ''

2
pkgs/top-level/python-packages.nix
View File

@ -2052,10 +2052,12 @@ in {
binwalk = callPackage ../development/python-modules/binwalk { binwalk = callPackage ../development/python-modules/binwalk {
pyqtgraph = null; pyqtgraph = null;
matplotlib = null;
}; };
binwalk-full = appendToName "full" (self.binwalk.override { binwalk-full = appendToName "full" (self.binwalk.override {
pyqtgraph = self.pyqtgraph; pyqtgraph = self.pyqtgraph;
matplotlib = self.matplotlib;
}); });
bitmath = callPackage ../development/python-modules/bitmath { }; bitmath = callPackage ../development/python-modules/bitmath { };