diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
| commit | a26c8e9b835647ae39d4259cfd55e8001ee57b93 (patch) | |
| tree | 55fe17fed5fc7625146a47e7f0e14b6581c18473 /pkgs/tools/misc | |
| parent | fa5ad20922cbc2b4ffbbb74edbc22d650d80441d (diff) | |
| parent | 9fd510e95ad8dd2d0e4c92f12fd9249594c30f23 (diff) | |
| download | nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.gz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.bz2 nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.lz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.xz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.zst nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/binwalk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/t1utils/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/binwalk/default.nix b/pkgs/tools/misc/binwalk/default.nix index 761ae6169ebe..6e16957aac26 100644 --- a/pkgs/tools/misc/binwalk/default.nix +++ b/pkgs/tools/misc/binwalk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, wrapPython, curses, mtdutils, zlib, xz, ncompress, gzip, bzip2, gnutar, p7zip, cabextract +{ stdenv, fetchFromGitHub, python, wrapPython, curses, zlib, xz, ncompress, gzip, bzip2, gnutar, p7zip, cabextract , pyqtgraph ? null , visualizationSupport ? false }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pythonPath = with stdenv.lib; [ curses ] ++ optional visualizationSupport [ pyqtgraph ]; - propagatedBuildInputs = with stdenv.lib; [ python wrapPython curses mtdutils zlib xz ncompress gzip bzip2 gnutar p7zip cabextract ] + propagatedBuildInputs = with stdenv.lib; [ python wrapPython curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract ] ++ optional visualizationSupport [ pyqtgraph ]; postInstall = "wrapPythonPrograms"; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index c00db07ed1f4..d68ab942e494 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; } |