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

Merge branch 'master' into closure-size

Browse Source 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
parent 50fccad582 2463e09173
commit 30f14243c3
344 changed files with 58220 additions and 29215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/rsyslog/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages
{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@@ -11,18 +11,18 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec {
name = "rsyslog-8.14.0";
name = "rsyslog-8.17.0";
src = fetchurl {
url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4";
sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc";
};
#patches = [ ./fix-gnutls-detection.patch ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis
pkgs/tools/system/s6-rc/default.nix
+5 -3
View File
@@ -2,7 +2,7 @@
let
version = "0.0.1.0";
version = "0.0.2.1";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-rc";
rev = "refs/tags/v${version}";
sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q";
sha256 = "0x9ghi1f7zqphzlzyz67z7n7mnnyxf1hghi2wa2f8cdl70nfdi2f";
};
dontDisableStatic = true;
@@ -29,7 +29,9 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
"--with-dynlib=${s6}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
meta = {
homepage = http://skarnet.org/software/s6-rc/;
pkgs/tools/system/s6/default.nix
+5 -3
View File
@@ -2,7 +2,7 @@
let
version = "2.2.1.0";
version = "2.2.4.3";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6";
rev = "refs/tags/v${version}";
sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9";
sha256 = "0j981xslcsra8filaawgwq6daqvxxjs0014lqb7dy3qf7c5pc4l8";
};
dontDisableStatic = true;
@@ -26,7 +26,9 @@ in stdenv.mkDerivation rec {
"--with-lib=${execline}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
preBuild = ''
substituteInPlace "src/daemontools-extras/s6-log.c" \