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

Merge pull request #16494 from k0ral/binwalk 

binwalk: 2.0.1 -> 2.1.1
This commit is contained in:
Pascal Wittmann 2016-06-25 16:21:15 +02:00 committed by GitHub
parent 4f5918cd2e 3632211cf9
commit 9ef6dceca9
3 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/tools/misc/binwalk/default.nix
View File

@ -1,32 +0,0 @@
{ stdenv, fetchFromGitHub, python, wrapPython, curses, zlib, xz, ncompress, gzip, bzip2, gnutar, p7zip, cabextract
, pyqtgraph ? null
, visualizationSupport ? false }:
assert visualizationSupport -> pyqtgraph != null;
stdenv.mkDerivation rec {
version = "2.0.1";
name = "binwalk-${version}";
src = fetchFromGitHub {
owner = "devttys0";
repo = "binwalk";
rev = "v${version}";
sha256 = "1r5389lk3gk8y4ksrfljyb97l6pwnwvv8g1slbgr20avkzgw8zmn";
};
pythonPath = with stdenv.lib; [ curses ]
++ optional visualizationSupport [ pyqtgraph ];
propagatedBuildInputs = with stdenv.lib; [ python wrapPython curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract ]
++ optional visualizationSupport [ pyqtgraph ];
postInstall = "wrapPythonPrograms";
meta = with stdenv.lib; {
homepage = "http://binwalk.org";
description = "A tool for searching a given binary image for embedded files";
platforms = platforms.all;
maintainers = [ maintainers.koral ];
};
}

14
pkgs/top-level/all-packages.nix
View File

@ -576,20 +576,6 @@ in
bins = callPackage ../tools/graphics/bins { }; bins = callPackage ../tools/graphics/bins { };
binwalk = callPackage ../tools/misc/binwalk {
python = pythonFull;
wrapPython = pythonPackages.wrapPython;
curses = pythonPackages.curses;
};
binwalk-full = callPackage ../tools/misc/binwalk {
python = pythonFull;
wrapPython = pythonPackages.wrapPython;
curses = pythonPackages.curses;
visualizationSupport = true;
pyqtgraph = pythonPackages.pyqtgraph;
};
bitbucket-cli = pythonPackages.bitbucket-cli; bitbucket-cli = pythonPackages.bitbucket-cli;
blink = callPackage ../applications/networking/instant-messengers/blink { blink = callPackage ../applications/networking/instant-messengers/blink {

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

@ -1874,6 +1874,34 @@ in modules // {
}; };
}; };
binwalk_fun = { visualizationSupport ? false, pyqtgraph ? null }:
assert visualizationSupport -> pyqtgraph != null;
buildPythonPackage rec {
name = "binwalk-${version}";
version = "2.1.1";
src = pkgs.fetchFromGitHub {
owner = "devttys0";
repo = "binwalk";
rev = "291a03595d17f848c73b74cb6ca508da782cd8f7";
sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
};
propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]
++ optional visualizationSupport [ pyqtgraph ];
meta = with stdenv.lib; {
homepage = "http://binwalk.org";
description = "A tool for searching a given binary image for embedded files";
platforms = platforms.all;
maintainers = [ maintainers.koral ];
};
};
binwalk = self.binwalk_fun { };
binwalk-full = self.binwalk_fun { visualizationSupport = true; pyqtgraph = self.pyqtgraph; };
caldavclientlibrary-asynk = buildPythonPackage rec { caldavclientlibrary-asynk = buildPythonPackage rec {
version = "asynkdev"; version = "asynkdev";
name = "caldavclientlibrary-asynk-${version}"; name = "caldavclientlibrary-asynk-${version}";