From 6fc40fada160c8b92869c155589c224fdec5fdc3 Mon Sep 17 00:00:00 2001
From: David Kleuker <git@davidak.de>
Date: Sun, 20 Sep 2015 21:16:22 +0200
Subject: [PATCH 1/2] add myself to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 78de8ca2c4457..5e9ab78a9559f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -70,6 +70,7 @@
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
+  davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";

From 775d1dc4b1f0fc06d12d5f8e51179c39e87859ce Mon Sep 17 00:00:00 2001
From: David Kleuker <git@davidak.de>
Date: Sun, 20 Sep 2015 21:46:10 +0200
Subject: [PATCH 2/2] iops: init at 0.1

---
 pkgs/tools/system/iops/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  6 ++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/system/iops/default.nix

diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
new file mode 100644
index 0000000000000..300fe59a97df3
--- /dev/null
+++ b/pkgs/tools/system/iops/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "iops-${version}";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "http://www.vanheusden.com/iops/${name}.tgz";
+    sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp iops $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Measure I/O operations per second of a storage device";
+    longDescription = ''
+      Iops lets you measure how many I/O operations per second a storage device can perform.
+      Usefull for determing e.g. the best RAID-setting of your storage device.
+    '';
+    homepage = http://www.vanheusden.com/iops/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; davidak;
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30668c593a900..789ab730bb163 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1877,9 +1877,11 @@ let
 
   inetutils = callPackage ../tools/networking/inetutils { };
 
-  innoextract = callPackage ../tools/archivers/innoextract {};
+  innoextract = callPackage ../tools/archivers/innoextract { };
 
-  ioping = callPackage ../tools/system/ioping {};
+  ioping = callPackage ../tools/system/ioping { };
+
+  iops = callPackage ../tools/system/iops { };
 
   iodine = callPackage ../tools/networking/iodine { };