diff options
author | Robert Schütz <nix@dotlambda.de> | 2022-01-11 23:40:02 +0000 |
---|---|---|
committer | Robert Schütz <nix@dotlambda.de> | 2022-01-16 18:39:59 +0000 |
commit | d5cceedbd13767b1770c0baac001167f3bf6d5ae (patch) | |
tree | efde5320c59f39bc8924eb0e7b2dfcaebe52388e /pkgs/tools/system | |
parent | 9356c3472c3c0a31fb5d6b9640ef7c958f76795c (diff) | |
download | nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.gz nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.bz2 nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.lz nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.xz nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.tar.zst nixpkgs-d5cceedbd13767b1770c0baac001167f3bf6d5ae.zip |
python,pythonPackages: make aliases
Since aliases are disallowed in nixpkgs, this makes usage of Python 2 which is EOL more explicit.
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/collectd/plugins.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/ps_mem/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/syslog-ng-incubator/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 6438a545a48..de8948db6c9 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 1752aba240f..073a0921f98 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 0f8db091d61..affb4bca6ce 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 51f8cd94da1..d0a22203aa9 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 |