From d5cceedbd13767b1770c0baac001167f3bf6d5ae Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Tue, 11 Jan 2022 23:40:02 +0000 Subject: python,pythonPackages: make aliases Since aliases are disallowed in nixpkgs, this makes usage of Python 2 which is EOL more explicit. --- pkgs/tools/system/collectd/plugins.nix | 4 ++-- pkgs/tools/system/ps_mem/default.nix | 4 ++-- pkgs/tools/system/syslog-ng-incubator/default.nix | 4 ++-- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 6438a545a485..de8948db6c91 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 1752aba240f3..073a0921f98e 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 0f8db091d616..affb4bca6cec 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 51f8cd94da1e..d0a22203aa9c 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 -- cgit 1.4.1