Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 82a484d375a8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1f7e20ca834
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 17, 2020

  1. python3.pkgs.binwalk 2.1.1 -> 2.2.0

    @flokli
    flokli committed Jan 17, 2020
    Copy the full SHA
    b5e9952 View commit details

Commits on Jan 19, 2020

  1. Merge pull request #77954 from flokli/binwalk-2.2.0 

    python3.pkgs.binwalk 2.1.1 -> 2.2.0
    @flokli
    flokli authored Jan 19, 2020
    Copy the full SHA
    b1f7e20 View commit details
Showing with 20 additions and 5 deletions.
  1. +20 −5 pkgs/development/python-modules/binwalk/default.nix
25 changes: 20 additions & 5 deletions pkgs/development/python-modules/binwalk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";