Merge branch 'devel' into 'main'

Devel

See merge request glicid-public/guix-glicid!209
This commit is contained in:
Jean-François GUILLAUME 2023-02-09 07:44:53 +00:00
commit b087089d21
2 changed files with 91 additions and 127 deletions

View file

@ -13,14 +13,14 @@
(define-public timescaledb (define-public timescaledb
(package (package
(name "timescaledb") (name "timescaledb")
(version "2.9.2") (version "2.9.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/timescale/timescaledb") (url "https://github.com/timescale/timescaledb")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "0siijqypx53lkb19y6zz7bx1bnbhk40b5ky5l74ckhv80nlffzfy")))) (sha256 (base32 "0ybrd1h8cjfhvvld6s1p82jwifmd8grl9abv3626dzx59nrgyjbr"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:imported-modules `((guix build union) (list #:imported-modules `((guix build union)

View file

@ -2,17 +2,15 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module ((gnu packages linux) #:use-module ((gnu packages linux) #:prefix gnu:)
#:prefix gnu:) #:use-module (gnu packages linux)
#:use-module (gnu packages linux) ;yes : redundant FIXIT
#:use-module (gnu system uuid) #:use-module (gnu system uuid)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -28,20 +26,12 @@
(version "44.0") (version "44.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz"))
"https://github.com/linux-rdma/rdma-core/releases/download/v" (sha256 (base32 "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5"))))))
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5"))))))
(define local-rdma-core
rdma-core-upstream-44.0)
(define-public rdma-core-latest
(latest-version local-rdma-core gnu:rdma-core))
(define local-rdma-core rdma-core-upstream-44.0)
(define-public rdma-core-latest (latest-version local-rdma-core gnu:rdma-core))
(define-public rdma-core-upstream-42.1 (define-public rdma-core-upstream-42.1
(package (package
@ -49,13 +39,8 @@
(version "42.1") (version "42.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz"))
"https://github.com/linux-rdma/rdma-core/releases/download/v" (sha256 (base32 "02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp"))))))
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp"))))))
(define-public libfabric-upstream-1.17.0 (define-public libfabric-upstream-1.17.0
(package (package
@ -64,22 +49,14 @@
(name (string-append (package-name gnu:libfabric) "-upstream")) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
"https://github.com/ofiwg/libfabric/releases/download/v" (sha256 (base32 "0pblwkgbnpf40is3isn47andkbm5j7dd8srx9lpwgh1nyrg0z72p"))))
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"0pblwkgbnpf40is3isn47andkbm5j7dd8srx9lpwgh1nyrg0z72p"))))
(inputs (modify-inputs (package-inputs gnu:libfabric) (inputs (modify-inputs (package-inputs gnu:libfabric)
(prepend `(,util-linux "lib") (prepend `(,util-linux "lib") gnu:numactl)))))
;; uuid.h, numa.h
gnu:numactl)))))
(define local-libfabric (define local-libfabric libfabric-upstream-1.17.0)
libfabric-upstream-1.17.0)
(define-public libfabric-latest (define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
(latest-version local-libfabric gnu:libfabric))
(define-public libfabric-upstream-1.16.1 (define-public libfabric-upstream-1.16.1
(package (package
@ -87,12 +64,8 @@
(version "1.16.1") (version "1.16.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2"))
"https://github.com/ofiwg/libfabric/releases/download/v" (sha256 (base32 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))))
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))))
(define-public psm2-upstream-11.2.230 (define-public psm2-upstream-11.2.230
(package (package
@ -105,15 +78,11 @@
(url "https://github.com/cornelisnetworks/opa-psm2") (url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version)))) (commit (string-append "PSM2_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))))
(base32
"1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))))
(define local-psm2 (define local-psm2 psm2-upstream-11.2.230)
psm2-upstream-11.2.230)
(define-public psm2-latest (define-public psm2-latest (latest-version local-psm2 gnu:psm2))
(latest-version local-psm2 gnu:psm2))
(define-public psm2-upstream-11.2.228 (define-public psm2-upstream-11.2.228
(package (package
@ -125,22 +94,17 @@
(url "https://github.com/cornelisnetworks/opa-psm2") (url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version)))) (commit (string-append "PSM2_" version))))
(file-name (git-file-name "local-psm2" version)) (file-name (git-file-name "local-psm2" version))
(sha256 (sha256 (base32 "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))))
(base32
"1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))))
(define-public corefreq (define-public corefreq
(package (package
(inherit gnu:corefreq) (inherit gnu:corefreq)
(name "corefreq") (name "corefreq")
(version "1.93.1") (version "1.95.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cyring/CoreFreq") (url "https://github.com/cyring/CoreFreq")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "108fr056zmbipiv1nsrjccn3ky0jbcwan43big34nyq1c9dqjq1x"))))))
(base32
"1crp1cmfcfd26j8rg29pl3lbkp135f17jr1686y0cb87v133kcq8"))))))