diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-03 14:44:12 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-03 14:44:12 +0100 |
commit | 6b10b7887229d0efa60e654693b26c1d48eb7629 (patch) | |
tree | a5776d253430e870c3babb07870e29aa5bbbf2bd /pkgs/tools/system | |
parent | ddfe60ab55da88967d1679898e45620721c713f8 (diff) | |
parent | 6928b5c12b217ccf0b6cd3da679ec88986640293 (diff) | |
download | nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.tar nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.tar.gz nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.tar.bz2 nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.tar.lz nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.tar.xz nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.tar.zst nixpkgs-6b10b7887229d0efa60e654693b26c1d48eb7629.zip |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/ps_mem/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index ad256e36656..bde4429c481 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchFromGitHub }: let - version = "3.12"; + version = "3.13"; pname = "ps_mem"; in pythonPackages.buildPythonApplication { name = "${pname}-${version}"; @@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication { owner = "pixelb"; repo = pname; rev = "v${version}"; - sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph"; + sha256 = "0pgi9hvwfbkzvwicqlkwx4rwal1ikza018yxbwpnf7c80zw0zaw9"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 8cf1b16a37d..5617ed9dc93 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -2,7 +2,7 @@ , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null -, libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null +, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null , libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl - librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq + librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; @@ -73,8 +73,7 @@ stdenv.mkDerivation rec { (mkFlag true "mmpstrucdata") (mkFlag (openssl != null) "mmrfc5424addhmac") (mkFlag (librelp != null) "relp") - (mkFlag (libgt != null) "guardtime") - (mkFlag (libksi != null) "gt-ksi") + (mkFlag (libksi != null) "ksi-ls12") (mkFlag (liblogging != null) "liblogging-stdlog") (mkFlag (liblogging != null) "rfc3195") (mkFlag true "imfile") |