Merge branch 'devel' into 'main'

test…

See merge request glicid-public/guix-glicid!302

glicid/packages/parallel.scm

@@ -1,6 +1,7 @@
 (define-module (glicid packages parallel)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses)
@@ -70,11 +71,11 @@
                     version "/pmix-" version ".tar.bz2"))
               (sha256
                (base32
-                "1j11n1j1g6dq49jxcy44s48jvncwvarb8wmcpmw3m397y91rasf4"))))
+                "1j11n1j1g6dq49jxcy44s48jvncwvarb8wmcpmw3m397y91rasf4"))))))
 
 
 (define-public openpmix
-  openpmix-4.1.0)
+  openpmix-4.2.4)
 
 (define-public slurm-20.02-upstream
   (package
@@ -177,6 +178,25 @@
               (prepend gtk+-2 openpmix
                        `(,mariadb "dev"))))))
 
+
+(define (package-with-configure-flags p flags)
+  "Return P with FLAGS as addition 'configure' flags."
+  (package/inherit p
+    (arguments
+     (substitute-keyword-arguments (package-arguments p)
+       ((#:configure-flags original-flags #~(list))
+        #~(append #$original-flags #$flags))))))
+
+
+(define slurm-base-package slurm-22.05-glicid)
+
+(define-public slurm-22.05-glicid2
+  (package
+    (inherit (package-with-configure-flags slurm-22.05-glicid
+                                           #~(list "--with-pmix=" #$(lookup-package-input slurm-base-package "openpmix"))))
+    (name "slurm-22.05-glicid2")))
+
+
 (define-public slurm-23.02-upstream
   (package
     (inherit slurm)