From d1491f490f04ab398cd6f520227f3904333da55a Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 2 Nov 2017 22:18:35 +0100 Subject: [PATCH 1/3] add sorki to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 797adae97b1..97411d57bea 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -585,6 +585,7 @@ snyh = "Xia Bin "; solson = "Scott Olson "; sorpaas = "Wei Tang "; + sorki = "Richard Marko "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; spinus = "Tomasz Czyż "; From 2b3726251990557f17457a50626ae4cbd86a1e3c Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 2 Nov 2017 22:19:13 +0100 Subject: [PATCH 2/3] ipmicfg: init at 1.27.0 --- pkgs/applications/misc/ipmicfg/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/ipmicfg/default.nix diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix new file mode 100644 index 00000000000..92a16656ac9 --- /dev/null +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchurl, patchelf, unzip }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "ipmicfg-${version}"; + version = "1.27.0"; + buildVersion = "170620"; + + src = fetchurl { + url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; + sha256 = "0mlhrxnkwazq5456csfds6w2z5pv2ksnqnxlv4prp07bwi2bccid"; + }; + + buildInputs = [ unzip ]; + installPhase = '' + mkdir -p "$out/opt/ipmicfg" + cp Linux/64bit/* "$out/opt/ipmicfg" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" + patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}:${stdenv.cc.cc.lib}/lib64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" + + mkdir "$out/bin" + ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" + ''; + + meta = with stdenv.lib; { + license = licenses.unfree; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc0a8342145..5886b757493 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2739,6 +2739,7 @@ with pkgs; ipmiutil = callPackage ../tools/system/ipmiutil {}; + ipmicfg = callPackage ../applications/misc/ipmicfg {}; ipmiview = callPackage ../applications/misc/ipmiview {}; ipcalc = callPackage ../tools/networking/ipcalc {}; From da067f40f93693083416d59028e4fa344941e394 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 2 Nov 2017 23:06:05 +0000 Subject: [PATCH 3/3] ipmicfg: fix style --- pkgs/applications/misc/ipmicfg/default.nix | 22 ++++++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 92a16656ac9..af67db3f654 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -1,31 +1,33 @@ -{ stdenv, lib, fetchurl, patchelf, unzip }: - -assert stdenv.isLinux; +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "ipmicfg-${version}"; version = "1.27.0"; buildVersion = "170620"; - src = fetchurl { + src = fetchzip { url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; - sha256 = "0mlhrxnkwazq5456csfds6w2z5pv2ksnqnxlv4prp07bwi2bccid"; + sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5"; }; - buildInputs = [ unzip ]; installPhase = '' - mkdir -p "$out/opt/ipmicfg" + mkdir -p "$out/bin" "$out/opt/ipmicfg" cp Linux/64bit/* "$out/opt/ipmicfg" - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" - patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}:${stdenv.cc.cc.lib}/lib64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" + patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" - mkdir "$out/bin" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ''; + dontPatchShebangs = true; # There are no scripts and it complains about null bytes. + meta = with stdenv.lib; { + description = "Supermicro IPMI configuration tool"; + homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ sorki ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5886b757493..908b0dc75ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2740,6 +2740,7 @@ with pkgs; ipmiutil = callPackage ../tools/system/ipmiutil {}; ipmicfg = callPackage ../applications/misc/ipmicfg {}; + ipmiview = callPackage ../applications/misc/ipmiview {}; ipcalc = callPackage ../tools/networking/ipcalc {};