Merge branch 'main' of gitlab.univ-nantes.fr:glicid-public/guix-glicid into main

Conflicts:
	glicid/packages/mpi.scm
This commit is contained in:
Yann Dupont 2021-11-26 22:05:24 +01:00
commit 5caf030209

View file

@ -99,19 +99,19 @@
) )
(define latest-openmpi gnu:openmpi) (define openmpi-latest gnu:openmpi)
(define-public openmpi-glicid (define-public openmpi-glicid
(package (package
(inherit gnu:openmpi) (inherit gnu:openmpi)
(version (string-append (package-version latest-openmpi) "-glicid" )) (version (string-append (package-version openmpi-latest) "-glicid" ))
(inputs `( (inputs `(
; ("ucx",ucx-latest) ;; should be latest beetween guix and glicid ; ("ucx",ucx-latest) ;; should be latest beetween guix and glicid
("rdma-core",rdma-core-latest) ;; should be latest beetween guix and glicid ("rdma-core",rdma-core-latest) ;; should be latest beetween guix and glicid
("libfabric",libfabric-latest) ("libfabric",libfabric-latest)
("slurm",slurm-20.02) ("slurm",slurm-20.02)
,@(package-inputs latest-openmpi))) ,@(package-inputs openmpi-latest)))
) )
) )