public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gcc-9

Browse Source
This commit is contained in:
Franz Pletz
2019-11-03 14:44:12 +01:00
parent ddfe60ab55 6928b5c12b
commit 6b10b78872
162 changed files with 1546 additions and 1691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/ps_mem/default.nix
+2 -2
View File
@@ -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; {
pkgs/tools/system/rsyslog/default.nix
+3 -4
View File
@@ -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")