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

Merge pull request #4238 from wkennington/master.boost

Browse Source 
Make boost 156 the default
This commit is contained in:
Peter Simons
2014-11-03 23:03:01 +01:00
parent 0346efdabf 8d605dafc6
commit b5fed52c43
86 changed files with 488 additions and 1839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/syslog-ng-incubator/default.nix
+9 -9
View File
@@ -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"
pkgs/tools/system/syslog-ng/default.nix
+4 -5
View File
@@ -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"