From 7dbb0238f692cae3cddd4934eb0ec2e6a0e7c90f Mon Sep 17 00:00:00 2001
From: "dupont-y@univ-nantes.fr" <yann.dupont@univ-nantes.fr>
Date: Tue, 11 Jul 2023 14:53:09 +0200
Subject: [PATCH] add pmix3 to pmix4

---
 glicid/packages/parallel.scm | 38 ++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm
index 290fca2..7405e42 100644
--- a/glicid/packages/parallel.scm
+++ b/glicid/packages/parallel.scm
@@ -47,6 +47,23 @@
     (inputs (list libevent
                   `(,hwloc-2 "lib") perl))))
 
+(define-public openpmix-3.2.4
+  (package
+    (inherit openpmix-3.1.5)
+    (version "3.2.4")
+
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/openpmix/openpmix/releases/download/v"
+                    version "/pmix-" version "-2.tar.bz2")) ;; note -2 !!
+              (sha256
+               (base32
+                "0hnqx2f72g2n5fnib5dv1qwfp2vjp00lbj1k9zlylpq5bbb3ykp5"))))
+
+))
+
+
 (define-public openpmix-4.1.0
   (package
     (inherit openpmix-3.1.5)
@@ -75,9 +92,14 @@
                (base32
                 "1j11n1j1g6dq49jxcy44s48jvncwvarb8wmcpmw3m397y91rasf4"))))))
 
+(define-public openpmix-3
+  openpmix-3.2.4)
+
+(define-public openpmix-4
+  openpmix-4.2.4)
 
 (define-public openpmix
-  openpmix-4.2.4)
+  openpmix-4)
 
 (define-public slurm-20.02-upstream
   (package
@@ -177,7 +199,7 @@
     (inherit slurm-22.05-latest)
     (name "slurm-glicid")
     (inputs (modify-inputs (package-inputs slurm-22.05-latest)
-              (prepend gtk+-2 openpmix
+              (prepend gtk+-2 openpmix-4 openpmix-3
                        `(,mariadb "dev"))))))
 
 
@@ -190,16 +212,6 @@
         #~(append #$original-flags #$flags))))))
 
 
-;(display slurm-22.05-glicid)
-;
-;(define-public slurm-22.05-glicid2
-;  (package
-;    (inherit (package-with-configure-flags slurm-22.05-glicid 
-;                                           #~(list "--with-pmix=" (assoc-ref inputs "openpmix") )))
-;;				            #~(list "--with-pmix")))
-;
-;    (name "slurm-22.05-glicid2")))
-
 
 (define-public slurm-22.05-glicid-b
   (package
@@ -214,7 +226,7 @@
                                   (ungexp (this-package-input "hwloc") "lib"))
                    (string-append "--with-json=" #$(this-package-input "json-c"))
                    (string-append "--with-munge=" #$(this-package-input "munge"))
-                   (string-append "--with-pmix=" #$(this-package-input "openpmix"))
+                   (string-append "--with-pmix=" #$(this-package-input openpmix-3))
 
                    ;; 32-bit support is marked as deprecated and needs to be
                    ;; explicitly enabled.