about summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-07-16 11:15:46 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-07-16 11:15:46 +0200
commita28a9ac156b921f394882be3c282e906f4662af5 (patch)
treed673d7f563445d1d7493734d3cbdfefecb4734bd /pkgs/tools/system
parente29cf290867c6781896bb191df057a6065fdf57b (diff)
parent0ddb9e04957e372eacfd7aedd8135cd605bc7517 (diff)
downloadnixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar
nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.gz
nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.bz2
nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.lz
nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.xz
nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.zst
nixlib-a28a9ac156b921f394882be3c282e906f4662af5.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/fio/default.nix4
-rw-r--r--pkgs/tools/system/monit/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 6dfc0991ed36..694a71d8ec11 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
-  version = "3.14";
+  version = "3.15";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "1qpv9saar0ik9mqpdyv93miyllfn7n7czcpffhk13lcrxasmjcp9";
+    sha256 = "0wzy5byc2qx5mbnwkcyjkrzc662n4wkrzpcg4h611q4ix494zka9";
   };
 
   buildInputs = [ python zlib ]
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 282729f31459..f4238e272480 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.25.3";
+  name = "monit-5.26.0";
 
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1";
+    sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47";
   };
 
   nativeBuildInputs = [ bison flex ];