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

Merge remote-tracking branch 'upstream/staging' into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-11-30 00:34:23 +02:00
parent 56366b5e66 2587611ed5
commit 8a4d6516ee
102 changed files with 417 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/afl/qemu.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl
{ stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl
, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
, libaio, libcap_ng, gnutls, pixman, autoconf
, writeText
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ python zlib pkgconfig glib pixman ncurses perl attr libcap
[ python2 zlib pkgconfig glib pixman ncurses perl attr libcap
vde2 texinfo libuuid flex bison lzo snappy autoconf
libcap_ng gnutls
]
pkgs/tools/security/tor/tor-arm.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
, pythonPackages, ncurses, lsof, nettools
, python2Packages, ncurses, lsof, nettools
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw";
};
nativeBuildInputs = [ makeWrapper pythonPackages.python ];
nativeBuildInputs = [ makeWrapper python2Packages.python ];
outputs = [ "out" "man" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
--replace "lsof -wnPi" "${lsof}/bin/lsof"
substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true'
substituteInPlace ./arm --replace "python" "${pythonPackages.python}/bin/python"
substituteInPlace ./arm --replace "python" "${python2Packages.python}/bin/python"
for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do
substituteInPlace $i --replace "/usr/share" "$out/share"