From ef1b67da0ec3d89d2075537d34997f463f68c7a3 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Fri, 25 Nov 2022 16:42:55 +0100
Subject: [PATCH 1/2] libfabric -> 1.17.0 and opx activation

---
 .../libraries/libfabric/default.nix           | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix
index baa33a51eef9..05946c277aea 100644
--- a/pkgs/development/libraries/libfabric/default.nix
+++ b/pkgs/development/libraries/libfabric/default.nix
@@ -1,9 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2
-, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, autoreconfHook
+, libpsm2
+, libuuid
+, numactl
+, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux)
+, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux)
+}:
 
 stdenv.mkDerivation rec {
   pname = "libfabric";
-  version = "1.15.1";
+  version = "1.17.0";
 
   enableParallelBuilding = true;
 
@@ -11,14 +20,17 @@ stdenv.mkDerivation rec {
     owner = "ofiwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-uL3L9k9yqdZXQmR1zi8OEIGLAZ8cf7EBnlDhetaMA08=";
+    sha256 = "sha256-tXfAn8hkasA2UuA4/8dOE3EcORyJo/A33TtSNdzDXD8=";
   };
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
 
-  buildInputs = lib.optional enablePsm2 libpsm2;
+  buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optional enablePsm2 [ libpsm2 ];
 
-  configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") ];
+  configureFlags = [
+    (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2")
+    (if enableOpx then "--enable-opx" else "--disable-opx")
+  ];
 
   meta = with lib; {
     homepage = "https://ofiwg.github.io/libfabric/";

From 0ac476fae0ecd642d9a2d8180b9a601cf0d0b077 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Tue, 17 Jan 2023 15:30:58 +0100
Subject: [PATCH 2/2] libfabric: resort inputs

---
 pkgs/development/libraries/libfabric/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix
index 05946c277aea..35ad72f8c7e9 100644
--- a/pkgs/development/libraries/libfabric/default.nix
+++ b/pkgs/development/libraries/libfabric/default.nix
@@ -3,11 +3,11 @@
 , fetchFromGitHub
 , pkg-config
 , autoreconfHook
+, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux)
 , libpsm2
+, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux)
 , libuuid
 , numactl
-, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux)
-, enableOpx ? (stdenv.isx86_64 && stdenv.isLinux)
 }:
 
 stdenv.mkDerivation rec {