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))