From 6c2c8ba7ab50e513f032b19efdf5f7cf68f6a11f Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Fri, 2 Jun 2017 17:00:08 -0700
Subject: [PATCH 1/3] Update ipmiview to current version 2.12.0 - 160804

---
 pkgs/applications/misc/ipmiview/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 0afcbca4979f..030431ef3129 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,12 +4,12 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "20151223";
+   version = "160804";
 
-   src = fetchurl {
-     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz";
-     sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121";
-   };
+   src = pkgs.fetchurl {
+    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.12.0_build.${version}_bundleJRE_Linux_x64.tar.gz";
+    sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
+  };
 
    buildInputs = [ patchelf makeWrapper ];
 
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
    };
   }
-

From 4c28cac0d36a4b2e54762ef6f123a936a8bac953 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Fri, 2 Jun 2017 17:03:52 -0700
Subject: [PATCH 2/3] Add buildversion and version

---
 pkgs/applications/misc/ipmiview/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 030431ef3129..b841f0642435 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,10 +4,11 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "160804";
+   version = "2.12.0";
+   buildVersion = "160804";
 
    src = pkgs.fetchurl {
-    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.12.0_build.${version}_bundleJRE_Linux_x64.tar.gz";
+    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
     sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
   };
 

From c2d1cf5f3645e7a32b9b2c0eaaf2995ca7e34a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Jun 2017 12:00:12 +0100
Subject: [PATCH 3/3] ipmiview: fix wrapper

---
 pkgs/applications/misc/ipmiview/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index b841f0642435..11ef001ef54b 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
    version = "2.12.0";
    buildVersion = "160804";
 
-   src = pkgs.fetchurl {
+   src = fetchurl {
     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
     sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
   };
@@ -24,8 +24,9 @@ stdenv.mkDerivation rec {
    installPhase = ''
      mkdir -p $out/bin
      cp -R . $out/
-     echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView
-     chmod +x $out/bin/IPMIView
+     makeWrapper $out/jre/bin/java $out/bin/IPMIView \
+       --prefix PATH : "$out/jre/bin" \
+       --add-flags "-jar $out/IPMIView20.jar"
    '';
 
    meta = with stdenv.lib; {