summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorJussi Maki <jussi.maki@gmail.com>2014-05-26 10:28:52 +0200
committerJussi Maki <jussi.maki@gmail.com>2014-05-26 10:28:52 +0200
commitab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3 (patch)
treeae1c27a1bc8149d863d6d464e5ebbb8ee03ab24f /pkgs/tools/system
parent75cb4857180b2afbcee7e12273ad87928c4d4395 (diff)
parentb0234f216ccf71013daf8e4e8b8bcfc4044d36cf (diff)
downloadnixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.tar
nixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.tar.gz
nixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.tar.bz2
nixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.tar.lz
nixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.tar.xz
nixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.tar.zst
nixlib-ab3aed6dfce24a7fbabee3adcf1c55862a8cc8b3.zip
Merge branch 'master' of https://github.com/NixOS/nixpkgs into ansible
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/monit/default.nix4
-rw-r--r--pkgs/tools/system/syslog-ng/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 28d58abe5aac..8e4848f2db62 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.8";
+  name = "monit-5.8.1";
   
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c";
+    sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2";
   };
 
   nativeBuildInputs = [ bison flex ];
diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 184701ceb598..cbffd8648d47 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, eventlog, pkgconfig, glib, python }:
 
 stdenv.mkDerivation {
-  name = "syslog-ng-3.5.3";
+  name = "syslog-ng-3.5.4.1";
 
   src = fetchurl {
-    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.3/source/syslog-ng_3.5.3.tar.gz";
-    sha256 = "1l3424qn9bf9z742pqba8x3dj7g729asimmhlizv1rvjlaxa2jd3";
+    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";
   };
 
   buildInputs = [ eventlog pkgconfig glib python ];