GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into 'main'

Browse source 
add pmix3 to pmix4

See merge request glicid-public/guix-glicid!310
This commit is contained in:
Yann Dupont 2023-07-11 12:54:19 +00:00
commit 4cebccb5e8
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
glicid/packages/parallel.scm
View file

@ -47,6 +47,23 @@
(inputs (list libevent (inputs (list libevent
`(,hwloc-2 "lib") perl)))) `(,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 (define-public openpmix-4.1.0
(package (package
(inherit openpmix-3.1.5) (inherit openpmix-3.1.5)
@ -75,9 +92,14 @@
(base32 (base32
"1j11n1j1g6dq49jxcy44s48jvncwvarb8wmcpmw3m397y91rasf4")))))) "1j11n1j1g6dq49jxcy44s48jvncwvarb8wmcpmw3m397y91rasf4"))))))
(define-public openpmix-3
openpmix-3.2.4)
(define-public openpmix-4
openpmix-4.2.4)
(define-public openpmix (define-public openpmix
openpmix-4.2.4) openpmix-4)
(define-public slurm-20.02-upstream (define-public slurm-20.02-upstream
(package (package
@ -177,7 +199,7 @@
(inherit slurm-22.05-latest) (inherit slurm-22.05-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs (modify-inputs (package-inputs slurm-22.05-latest) (inputs (modify-inputs (package-inputs slurm-22.05-latest)
(prepend gtk+-2 openpmix (prepend gtk+-2 openpmix-4 openpmix-3
`(,mariadb "dev")))))) `(,mariadb "dev"))))))
@ -190,16 +212,6 @@
#~(append #$original-flags #$flags)))))) #~(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 (define-public slurm-22.05-glicid-b
(package (package
@ -214,7 +226,7 @@
(ungexp (this-package-input "hwloc") "lib")) (ungexp (this-package-input "hwloc") "lib"))
(string-append "--with-json=" #$(this-package-input "json-c")) (string-append "--with-json=" #$(this-package-input "json-c"))
(string-append "--with-munge=" #$(this-package-input "munge")) (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 ;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled. ;; explicitly enabled.