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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source
This commit is contained in:
Peter Simons
2014-08-08 09:51:01 +02:00
parent 5c276c4f68 bdf5f45356
commit 9226fbf56a
143 changed files with 2128 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/system/syslog-ng-incubator/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "syslog-ng-incubator-${version}";
version = "0.3.1";
version = "0.3.3";
src = fetchurl {
url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz";
sha256 = "0zr0vlp7cq3qfhqhalf7rdyd54skswxnc9j9wi8sfmz3psy3vd4y";
sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8";
};
buildInputs = [

15
pkgs/tools/system/syslog-ng/default.nix
View File

@@ -1,11 +1,13 @@
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }:
stdenv.mkDerivation {
name = "syslog-ng-3.5.4.1";
stdenv.mkDerivation rec {
name = "syslog-ng-${version}";
version = "3.5.6";
src = fetchurl {
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.4.1/source/syslog-ng_3.5.4.1.tar.gz";
sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj";
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc";
};
buildInputs = [ eventlog pkgconfig glib python systemd perl ];
@@ -16,9 +18,10 @@ stdenv.mkDerivation {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
meta = {
meta = with stdenv.lib; {
homepage = "http://www.balabit.com/network-security/syslog-ng/";
description = "Next-generation syslogd with advanced networking and filtering capabilities";
license = stdenv.lib.licenses.gpl2;
license = licenses.gpl2;
maintainers = [ maintainers.rickynils ];
};
}