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

binwalk: simplify visualizationSupport code

Browse Source
This commit is contained in:
Luflosi 2021-02-01 19:17:58 +01:00
parent 5b6a9dc85c
commit 1ca5d3117c
No known key found for this signature in database
GPG Key ID: 4E41E29EDCC345D0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,10 @@
, matplotlib , matplotlib
, nose , nose
, pycrypto , pycrypto
, pyqtgraph ? null }: , pyqtgraph
, visualizationSupport ? false }:
let let
visualizationSupport = (pyqtgraph != null) && (matplotlib != null);
version = "2.2.0"; version = "2.2.0";
in in
buildPythonPackage { buildPythonPackage {

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

@ -931,14 +931,10 @@ in {
binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
binwalk = callPackage ../development/python-modules/binwalk { binwalk = callPackage ../development/python-modules/binwalk { };
pyqtgraph = null;
matplotlib = null;
};
binwalk-full = appendToName "full" (self.binwalk.override { binwalk-full = appendToName "full" (self.binwalk.override {
pyqtgraph = self.pyqtgraph; visualizationSupport = true;
matplotlib = self.matplotlib;
}); });
biopython = callPackage ../development/python-modules/biopython { }; biopython = callPackage ../development/python-modules/biopython { };