From e4bd8a6faba6cbd1e4ebb0617a1727cfea1ada19 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 25 Dec 2019 09:02:20 +0100 Subject: htop: switch to python 3 --- pkgs/tools/system/htop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 12e54b1b22e..1b68273a570 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, ncurses, -IOKit, python }: +IOKit, python3 }: stdenv.mkDerivation rec { pname = "htop"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; }; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; -- cgit 1.4.1 From 13f08afb52669884a88f3dcb7d3d5e84b1ed5787 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Jan 2020 06:55:24 +0000 Subject: bfs: 1.5.1 -> 1.5.2 --- pkgs/tools/system/bfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index a304fce352f..1387a6c6ed1 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1yp8zaj2rqd1df20wxym1x7q5d3lxqwalazbvmfnwqn5y4m368y3"; + sha256 = "04jgah6yvz3i2bwrv1ki2nmj1yinba7djbfq8n8ism4gffsza9dz"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; -- cgit 1.4.1 From 651e73484e7842b02d6f05422479b99dbe2606c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 20 Jan 2020 13:10:24 -0800 Subject: facter: 3.14.6 -> 3.14.7 (#78083) --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 86aa5adb6f8..acc3990378f 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.6"; + version = "3.14.7"; src = fetchFromGitHub { - sha256 = "1zfff1mpdwnlnm8dmmlvysw2zdsnglgk5nvhhzx8zyk0zyz0nj54"; + sha256 = "1x71ynnp8l5bf6m1a56rwcjya2swrhpxmd0cg9ndjplam6zys2v7"; rev = version; repo = pname; owner = "puppetlabs"; -- cgit 1.4.1 From dbc61de0051efaad8e986d5bc601fbacbb90619b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 Jan 2020 16:51:30 +0000 Subject: hwinfo: 21.67 -> 21.68 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index d323f048ba0..048af14efb1 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.67"; + version = "21.68"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji"; + sha256 = "0x63rkyl16918l8yf0azy2lyxaqy8nc6iafid89acvxn32j146rg"; }; patchPhase = '' -- cgit 1.4.1 From dc1d9a578d45a14298b3def5c3cdd1b9afc5ada9 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 22 Jan 2020 13:02:36 +0900 Subject: s-tui: 0.8.3 -> 1.0.0 --- pkgs/tools/system/s-tui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 063a338f6e8..924269b6637 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonPackage rec { pname = "s-tui"; - version = "0.8.3"; + version = "1.0.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m"; + sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"; }; propagatedBuildInputs = with pythonPackages; [ -- cgit 1.4.1 From da5bb025c6a942ec21edb3d1d2c84d5dfef0b901 Mon Sep 17 00:00:00 2001 From: vasile luta Date: Wed, 8 Jan 2020 10:46:14 +0200 Subject: rsyslog: include libmaxminddb --- pkgs/tools/system/rsyslog/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 7c5b9a18966..9d3cbbf79eb 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -4,6 +4,7 @@ , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null , libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null +, libmaxminddb ? null }: with stdenv.lib; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq - rabbitmq-c hiredis mongoc + rabbitmq-c hiredis mongoc libmaxminddb ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; @@ -61,6 +62,7 @@ stdenv.mkDerivation rec { (mkFlag true "rsyslogd") (mkFlag true "mail") (mkFlag (liblognorm != null) "mmnormalize") + (mkFlag (libmaxminddb != null) "mmdblookup") (mkFlag true "mmjsonparse") (mkFlag true "mmaudit") (mkFlag true "mmanon") -- cgit 1.4.1