diff options
Diffstat (limited to 'pkgs/tools')
20 files changed, 45 insertions, 45 deletions
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 9c49c4677d2a5..5825f8b25eeb3 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python +{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2 , lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { version = "1.5.1.81"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which attr python ]; + buildInputs = [ which attr python2 ]; patches = [ (fetchpatch { diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index edb94891fbe9e..13f3c42faa46b 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake +{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k"; }; - nativeBuildInputs = [ autogen flex bison python autoconf automake ]; + nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bc7baa55fecdf..bffcd5e1dca4b 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python, git +, python2, git }: let jdk = jdk8; jre = jdk8.jre; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ autoconf automake curl jdk nettools python git ]; + buildInputs = [ autoconf automake curl jdk nettools python2 git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index bfc2ce2c0e99f..4dd19a7f397a9 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -29,7 +29,7 @@ , bubblewrap , pcre , check -, python +, python2 , json_c , zchunk , libmodulemd @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { librepo pcre check - python + python2 # libdnf # vendored unstable branch # required by vendored libdnf diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 37361abf2b2f3..80d9e191c8a60 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, util-linux, json_c, nixosTests +, lvm2, pam, python2, util-linux, json_c, nixosTests , ncurses }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python util-linux json_c ncurses + lvm2 pam python2 util-linux json_c ncurses ]; passthru.tests.snapper = nixosTests.snapper; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index e112b8c1df124..3c6eff4d601c7 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , pkg-config, makeWrapper, autoreconfHook -, openldap, python, pam +, openldap, python2, pam }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; - buildInputs = [ openldap pam python ]; + buildInputs = [ openldap pam python2 ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 60bd2f8cc7e8c..dc447f3a86b90 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "philter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,share/philter} cp .philterrc "$out"/share/philter/philterrc - sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py + sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py cp src/philter.py "$out"/bin/philter chmod +x "$out"/bin/philter ''; diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index a17701644c87b..1d7d006f537a3 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, fetchFromGitHub, python2Packages, openssh, rsync }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "pssh"; version = "2.3.1"; diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix index 7a2774002891f..8f5958193db89 100644 --- a/pkgs/tools/networking/py-wmi-client/default.nix +++ b/pkgs/tools/networking/py-wmi-client/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "py-wmi-client"; version = "unstable-20160601"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d"; }; - propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ]; + propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ]; # no tests doCheck = false; diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index 7c3d23c0d17fb..7a26ffdeb436c 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, libev, wafHook }: +{ lib, stdenv, fetchgit, python2, libev, wafHook }: stdenv.mkDerivation rec { pname = "weighttp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wafHook ]; - buildInputs = [ python libev ]; + buildInputs = [ python2 libev ]; meta = with lib; { description = "Lightweight and simple webserver benchmarking tool"; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 4abbbd2d1d1f1..9c73f8a001958 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "volatility"; version = "2.6.1"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ]; + propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ]; meta = with lib; { homepage = "https://www.volatilityfoundation.org/"; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 6438a545a485f..de8948db6c91a 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -31,7 +31,7 @@ , perl , postgresql , protobufc -, python +, python2 , rabbitmq-c , rdkafka , riemann_c_client @@ -102,7 +102,7 @@ let pinba.buildInputs = [ protobufc ]; ping.buildInputs = [ liboping ]; postgresql.buildInputs = [ postgresql ]; - python.buildInputs = [ python ]; + python.buildInputs = [ python2 ]; redis.buildInputs = [ hiredis ]; rrdcached.buildInputs = [ rrdtool libxml2 ]; rrdtool.buildInputs = [ rrdtool libxml2 ]; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 1752aba240f32..073a0921f98e2 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,9 +1,9 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: let version = "3.13"; pname = "ps_mem"; -in pythonPackages.buildPythonApplication { +in python2Packages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 0f8db091d6165..affb4bca6cec8 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng -, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq +, eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook bison ]; buildInputs = [ - glib syslogng eventlog perl python protobufc libivykis libcap czmq + glib syslogng eventlog perl python2 protobufc libivykis libcap czmq ]; configureFlags = [ diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 51f8cd94da1e4..d0a22203aa9cb 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libcap, curl, which -, eventlog, pkg-config, glib, python, systemd, perl +, eventlog, pkg-config, glib, python2, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c , libesmtp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { eventlog glib perl - python + python2 systemd riemann_c_client protobufc diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index cbb055323a68a..5ad14295e8728 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { pname = "opencc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python2 ]; # let intermediate tools find intermediate library preBuild = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index eb299caade9c0..9f237066d7c1c 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { version = "2.6"; @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { dontBuild = true; # Python script, needs the interpreter - propagatedBuildInputs = [ python ]; + propagatedBuildInputs = [ python2 ]; installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/share/doc" mkdir -p "$out/share/man/man1/" - sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags" + sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags" chmod +x "$out/bin/txt2tags" gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz" cp doc/userguide.pdf "$out/share/doc" diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 85dcece956fb9..252167fcea973 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, libreoffice }: +{ lib, fetchFromGitHub, python2Packages, libreoffice }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "odpdown"; version = "0.4.1"; @@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4="; }; - propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; + propagatedBuildInputs = with python2Packages; [ libreoffice lpod lxml mistune pillow pygments ]; - checkInputs = with pythonPackages; [ + checkInputs = with python2Packages; [ nose ]; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index fdaf2ee274667..f32078f0b8a02 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "vnc2flv"; version = "20100207"; diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index ab3c9b1e71cdc..2497cc6a9df0f 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: +{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; }; - buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; + buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ]; patches = [ ./ip-address.patch ]; postPatch = '' tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" |