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

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

View File

@ -12,12 +12,13 @@
, cramfsprogs
, cramfsswap
, lzma
, matplotlib
, nose
, pycrypto
, pyqtgraph ? null }:
let
visualizationSupport = (pyqtgraph != null);
visualizationSupport = (pyqtgraph != null) && (matplotlib != null);
version = "2.2.0";
in
buildPythonPackage {
@ -32,7 +33,7 @@ buildPythonPackage {
};
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
postPatch = ''

View File

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