diff options
| author | Peter Simons <simons@cryp.to> | 2014-08-08 09:51:01 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-08-08 09:51:01 +0200 |
| commit | 9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2 (patch) | |
| tree | e61a7de75f426c942f91da2b0828149631d92957 /pkgs/tools/system | |
| parent | 5c276c4f68125e7d53e0467a3e74969dbd05b51b (diff) | |
| parent | bdf5f45356afd6f4289e5e1f497a48c3dc54b38c (diff) | |
| download | nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.gz nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.bz2 nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.lz nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.xz nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.zst nixlib-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.zip | |
Merge remote-tracking branch 'origin/master' into staging.
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/syslog-ng-incubator/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 93cc7fa7c5da..34a0f15ec1db 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -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 = [ diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 89bf06886518..a62f81052bad 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -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 ]; }; } |