From ced55630564bdc8abb69792aacdd5bd1d9f11e46 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 3 Oct 2018 12:59:07 +0200 Subject: [PATCH 1/2] opensm: 3.3.20 -> 3.3.21 Old git source repository was dead. Switched to GitHub --- pkgs/tools/networking/opensm/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index a053c82a826..075ceff3555 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: stdenv.mkDerivation rec { name = "opensm-${version}"; - version = "3.3.20"; + version = "3.3.21"; - src = fetchgit { - url = git://git.openfabrics.org/~halr/opensm.git; - rev = name; - sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl"; + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "opensm"; + rev = "${version}"; + sha256 = "0iikw28vslxq3baq9qmmw08yay7l524wciz7dv7km09ylcbx23b7"; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { preConfigure = "bash ./autogen.sh"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Infiniband subnet manager"; homepage = https://www.openfabrics.org/; From e6c947ad7065eceb1a8c56563db1cb96d66d44f1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 21:11:14 +0200 Subject: [PATCH 2/2] opensm: use native shell to run autogen.sh --- pkgs/tools/networking/opensm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index 075ceff3555..ea20306e26f 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ rdma-core ]; - preConfigure = "bash ./autogen.sh"; + preConfigure = '' + patchShebangs ./autogen.sh + ./autogen.sh + ''; enableParallelBuilding = true;