diff options
| author | Florian Klink <flokli@flokli.de> | 2020-01-19 16:50:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 16:50:41 +0100 |
| commit | b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f (patch) | |
| tree | 1281dd273d706f0255889b21c099ed848be7dfc3 /pkgs | |
| parent | 82a484d375a88f5a40813c137e2bc7920c063902 (diff) | |
| parent | b5e99522b1f3254cec695d8a76b1d18d1637ce83 (diff) | |
| download | nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.tar nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.tar.gz nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.tar.bz2 nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.tar.lz nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.tar.xz nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.tar.zst nixpkgs-b1f7e20ca834f4b1ebf0df0da0ad2698ec65635f.zip | |
Merge pull request #77954 from flokli/binwalk-2.2.0
python3.pkgs.binwalk 2.1.1 -> 2.2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/binwalk/default.nix | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index ec613527e92..97c6b957a43 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -10,24 +10,39 @@ , p7zip , cabextract , lzma +, nose , pycrypto , pyqtgraph ? null }: -let visualizationSupport = (pyqtgraph != null); +let + visualizationSupport = (pyqtgraph != null); + version = "2.2.0"; in buildPythonPackage { pname = "binwalk"; - version = "2.1.1"; + inherit version; src = fetchFromGitHub { owner = "devttys0"; repo = "binwalk"; - rev = "291a03595d17f848c73b74cb6ca508da782cd8f7"; - sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw"; + rev = "be738a52e09b0da2a6e21470e0dbcd5beb42ed1b"; + sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] - ++ stdenv.lib.optional visualizationSupport pyqtgraph; + ++ stdenv.lib.optional visualizationSupport pyqtgraph; + + # setup.py only installs version.py during install, not test + postPatch = '' + echo '__version__ = "${version}"' > src/binwalk/core/version.py + ''; + + # binwalk wants to access ~/.config/binwalk/magic + preCheck = '' + HOME=$(mktemp -d) + ''; + + checkInputs = [ nose ]; meta = with stdenv.lib; { homepage = "https://github.com/ReFirmLabs/binwalk"; |