From 1bf7beff012075c0ae78efa35f05f0915eaa7d24 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Fri, 27 Jan 2023 14:46:31 +0100
Subject: [PATCH 1/2] Revert "libfabric: resort inputs"

This reverts commit 0ac476fae0ecd642d9a2d8180b9a601cf0d0b077.
---
 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 35ad72f8c7e9..05946c277aea 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 {

From c9ce56c0e389875f2e4b0f05586182128ec9c8c9 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Fri, 27 Jan 2023 14:46:45 +0100
Subject: [PATCH 2/2] Revert "libfabric -> 1.17.0 and opx activation"

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

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