summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2015-04-18 19:45:01 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2015-04-24 11:54:38 +0200
commit290c21757758b91be11f587628559418451e06a3 (patch)
treec478115012675ddeafbbd700d03ac455a80d0a9d
parenta579886b2b04908bb0bc95b751bf0e7e3ffeb59d (diff)
downloadnixpkgs-290c21757758b91be11f587628559418451e06a3.tar
nixpkgs-290c21757758b91be11f587628559418451e06a3.tar.gz
nixpkgs-290c21757758b91be11f587628559418451e06a3.tar.bz2
nixpkgs-290c21757758b91be11f587628559418451e06a3.tar.lz
nixpkgs-290c21757758b91be11f587628559418451e06a3.tar.xz
nixpkgs-290c21757758b91be11f587628559418451e06a3.tar.zst
nixpkgs-290c21757758b91be11f587628559418451e06a3.zip
ioping: reimplement using mkDerivation
Also
- set platform unix (upstream claims to support bsd and sun as well)
- fetch source from GitHub
-rw-r--r--pkgs/tools/system/ioping/default.nix55
1 files changed, 14 insertions, 41 deletions
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 932b68197ce..54721f7ce73 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,47 +1,20 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ioping";
-    version = "0.9";
-    name="${baseName}-${version}";
-    url="https://docs.google.com/uc?id=0B_PlDc2qaehFWWtLZ3Z3N1ltdm8&export=download";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    name = "${sourceInfo.name}.tar.gz";
+stdenv.mkDerivation rec {
+  name = "ioping-${version}";
+  version = "0.9";
+  src = fetchurl {
+    url = "https://github.com/koct9i/ioping/releases/download/v${version}/${name}.tar.gz";
     sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  makeFlags = "PREFIX=$(out)";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doMakeInstall"];
-  makeFlags = [
-    ''PREFIX="$out"''
-  ];
-      
-  meta = {
-    description = "Filesystem IO delay time measurer";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl3Plus;
-    homepage = "http://code.google.com/p/ioping/";
-    inherit version;
+  meta = with stdenv.lib; {
+    description = "Disk I/O latency measuring tool";
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; unix;
+    license = licenses.gpl3Plus;
+    homepage = https://github.com/koct9i/ioping;
   };
-}) x
-
+}