diff --git a/glicid/packages/containers.scm b/glicid/packages/containers.scm new file mode 100644 index 0000000..ffe4639 --- /dev/null +++ b/glicid/packages/containers.scm @@ -0,0 +1,21 @@ +(define-module (glicid packages containers) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module ((gnu packages containers) #:prefix gnu:) +) + +(define-public podman + (package + (inherit gnu:podman) + (name "podman") + (version "4.1.0") + (source (origin + (method url-fetch) + (uri (list + (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") + )) + (sha256 (base32 "158fyxv2hd1nwirabrwxascl9lkdphhv0knwrk0qdm0ifcmf257q")) + )) + ) +) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index dc4dc93..3a7d142 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -131,81 +131,23 @@ ) -(define-public libfabric-opx-beta-upstream-1.14.0-c - -(let ((commit "e127cd074bbfd8c50b9f3cfb5b8e24162f8076a4")) +(define-public libfabric-upstream-1.15.1 (package (inherit gnu:libfabric) - (version "1.14.0c") - (name (string-append (package-name gnu:libfabric) "-opx-beta-upstream" )) - + (version "1.15.1") + (name (string-append (package-name gnu:libfabric) "-upstream" )) (source (origin - - (method git-fetch) - (uri (git-reference - (url "https://github.com/ofiwg/libfabric.git") - (commit commit) - )) - (file-name (git-file-name name version)) - (sha256 (base32 "0fh665l2xcl59zhbn63y5bm8v9s652gk5s8r094qb4if0bp3in04")) - + (method url-fetch) + (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) + (sha256 (base32 "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna")) ) ) - (inputs `( - ("autoconf", autoconf) - ("automake", automake) - ("libtool", libtool) - ("libuuid" , util-linux "lib") - ("numactl" , gnu:numactl) - ("psm2" , gnu:psm2) - ,@(package-inputs gnu:libfabric))) - ) - ) ) -(define-public libfabric-opx-beta-upstream-1.14.0-d - -(let ((commit "e127cd074bbfd8c50b9f3cfb5b8e24162f8076a4")) - (package - (inherit gnu:libfabric) - (version "1.14.0d") - (name (string-append (package-name gnu:libfabric) "-opx-beta-upstream" )) - - (source - (origin - - (method git-fetch) - (uri (git-reference - (url "https://github.com/ofiwg/libfabric.git") - (commit commit) - )) - (file-name (git-file-name name version)) - (sha256 (base32 "0fh665l2xcl59zhbn63y5bm8v9s652gk5s8r094qb4if0bp3in04")) - - ) - ) - (inputs `( - ("autoconf", autoconf) - ("automake", automake) - ("libtool", libtool) - ("libuuid" , util-linux "lib") - ("numactl" , gnu:numactl) - ; ("psm2" , gnu:psm2) ; intended : no psm2 - ,@(package-inputs gnu:libfabric))) - - ) - ) -) - - - -;(define local-libfabric libfabric-opx-beta-upstream-1.14.0-c) -;(define local-libfabric libfabric-opx-beta-upstream-1.14.0-d) -;(define local-libfabric libfabric-upstream-1.14.1) -(define local-libfabric libfabric-upstream-1.15.0) +(define local-libfabric libfabric-upstream-1.15.1) (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric)) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index e5694a2..820f9fe 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -28,7 +28,28 @@ ) ) -(define local-openmpi openmpi-upstream-4.1.2) +(define-public openmpi-upstream-4.1.4 + (package + (inherit gnu:openmpi) + (name "openmpi-upstream") + (version "4.1.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.open-mpi.org/software/ompi/v" + (version-major+minor version) + "/downloads/openmpi-" version ".tar.bz2")) + (sha256 (base32 "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) + (patches (search-patches "openmpi-mtl-priorities.patch")) + ) + ) + ) +) + + + + +(define local-openmpi openmpi-upstream-4.1.4) (define-public openmpi-latest (latest-version local-openmpi gnu:openmpi))