Merge pull request #1561 from wizeman/u/ipmiutil

ipmiutil: Update from 2.7.3 -> 2.9.2 and simplify

1 files changed, 25 insertions, 44 deletions

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index d5252116f640..9f2afb9a0b28 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -1,55 +1,36 @@
-x@{builderDefsPackage
-  , openssl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, openssl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ipmiutil";
-    version="2.7.3";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${name}.tar.gz";
-    hash="0z6ykz5db4ws7hpi25waf9vznwsh0vp819h5s7s8r054vxslrfpq";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  baseName = "ipmiutil";
+  version = "2.9.2";
+  name = "${baseName}-${version}";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
+    sha256 = "1n7amk8wbx9a9gbm37nyb8v0c37qgp6hv4hn3nln80rr6g98f9n3";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "fixMakefile" "doMakeInstall"];
+  buildInputs = [ openssl ];
 
-  fixMakefile = a .fullDepEntry ''
+  preBuild = ''
     sed -e "s@/usr@$out@g" -i Makefile */Makefile */*/Makefile
-    sed -e "s@/etc@$out/etc@g" -i Makefile */Makefile
-    sed -e "s@/var@$out/var@g" -i Makefile */Makefile
-  '' ["minInit" "doConfigure"];
-      
-  meta = {
-    description = "IPMI utilities";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.bsd3;
+    sed -e "s@/etc@$out/etc@g" -i Makefile */Makefile */*/Makefile
+    sed -e "s@/var@$out/var@g" -i Makefile */Makefile */*/Makefile
+  '';
+
+  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+
+  meta = with stdenv.lib; {
+    description = "An easy-to-use IPMI server management utility";
+    homepage = http://ipmiutil.sourceforge.net/;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.bsd3;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
     };
   };
-}) x
-
+}