mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-29 21:58:36 +02:00
Merge branch 'devel' into 'main'
Devel See merge request glicid-public/guix-glicid!490
This commit is contained in:
commit
3b00c371a8
2 changed files with 23 additions and 4 deletions
|
@ -6,14 +6,33 @@
|
||||||
#:use-module (glicid utils)
|
#:use-module (glicid utils)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (glicid packages parallel)
|
#:use-module (glicid packages parallel)
|
||||||
|
#:use-module (gnu packages parallel)
|
||||||
|
#:use-module (guix gexp)
|
||||||
#:use-module (gnu packages))
|
#:use-module (gnu packages))
|
||||||
|
|
||||||
(define-public openmpi-glicid
|
(define-public openmpi-glicid
|
||||||
(package
|
(package/inherit gnu:openmpi-4
|
||||||
(inherit gnu:openmpi-4)
|
|
||||||
(name "openmpi-glicid")
|
(name "openmpi-glicid")
|
||||||
(inputs (modify-inputs (package-inputs gnu:openmpi-4)
|
(inputs (modify-inputs (package-inputs gnu:openmpi-4)
|
||||||
|
(append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3
|
||||||
(replace "slurm" slurm-glicid)))
|
(replace "slurm" slurm-glicid)))
|
||||||
|
|
||||||
))
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
(define-public openmpi-glicid-new
|
||||||
|
(package/inherit gnu:openmpi-4
|
||||||
|
(name "openmpi-glicid")
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments gnu:openmpi-4)
|
||||||
|
((#:configure-flags flags)
|
||||||
|
(append `(cons* "--with-pmix=external" ,flags)))))
|
||||||
|
(inputs (modify-inputs (package-inputs gnu:openmpi-4)
|
||||||
|
(append openpmix) ;; because we use pmix4 now, openpmi-4 defaults to internal pmix3
|
||||||
|
(replace "slurm" slurm-glicid)))
|
||||||
|
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
(define-public vaultwarden-0.32
|
(define-public vaultwarden-0.32
|
||||||
(package
|
(package
|
||||||
(name "vaultwarden")
|
(name "vaultwarden")
|
||||||
(version "0.32.7")
|
(version "1.32.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
Loading…
Add table
Reference in a new issue