diff options
author | Peter Simons <simons@cryp.to> | 2014-11-03 23:03:01 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-11-03 23:03:01 +0100 |
commit | b5fed52c43360c8a1e6b632236ad41d98c59f804 (patch) | |
tree | efcffbcbed9a980ee912f914baf535bf6181e74d /pkgs/tools/system | |
parent | 0346efdabfeef55d64c738e093795acc0e80d2d8 (diff) | |
parent | 8d605dafc65ede7c4d33178192807612527c911d (diff) | |
download | nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.gz nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.bz2 nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.lz nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.xz nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.tar.zst nixpkgs-b5fed52c43360c8a1e6b632236ad41d98c59f804.zip |
Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/syslog-ng-incubator/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 9 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 34a0f15ec1d..73d1f8fdff6 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, glib, syslogng -, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng +, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc +}: stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.3.3"; - src = fetchurl { - url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; - sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8"; + src = fetchFromGitHub { + owner = "balabit"; + repo = "syslog-ng-incubator"; + rev = name; + sha256 = "0pswajcw9f651c1jmprbf1mlr6qadiaplyygz5j16vj0d23x4mal"; }; buildInputs = [ - autoconf automake libtool pkgconfig glib syslogng eventlog perl python + autoreconfHook pkgconfig glib syslogng eventlog perl python yacc riemann_c_client libivykis protobufc ]; - preConfigure = "autoreconf -i"; - configureFlags = [ "--without-ivykis" "--with-riemann" diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index cec906e1f43..a62f81052ba 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, yacc }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.6.1"; + version = "3.5.6"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; + sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; + buildInputs = [ eventlog pkgconfig glib python systemd perl ]; configureFlags = [ "--enable-dynamic-linking" |