diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 12da922..ae5b43e 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -6,14 +6,33 @@ #:use-module (glicid utils) #:use-module (guix utils) #:use-module (glicid packages parallel) + #:use-module (gnu packages parallel) + #:use-module (guix gexp) #:use-module (gnu packages)) (define-public openmpi-glicid - (package - (inherit gnu:openmpi-4) + (package/inherit gnu:openmpi-4 (name "openmpi-glicid") (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))) - )) + ) +) + + + +(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))) + + ) +) diff --git a/glicid/packages/password-utils.scm b/glicid/packages/password-utils.scm index ad0cf52..b33b481 100644 --- a/glicid/packages/password-utils.scm +++ b/glicid/packages/password-utils.scm @@ -16,7 +16,7 @@ (define-public vaultwarden-0.32 (package (name "vaultwarden") - (version "0.32.7") + (version "1.32.7") (source (origin (method url-fetch)