Merge branch 'devel' into 'main'

Devel

See merge request glicid-public/guix-glicid!169
This commit is contained in:
Yann Dupont 2023-01-02 10:54:03 +00:00
commit 8eee212707
3 changed files with 34 additions and 117 deletions

View file

@ -48,5 +48,5 @@
`(#:configure-flags (list (string-append "--enable-snmp")
(string-append "--enable-snmp-checker")
(string-append "--enable-snmp-rfc"))))
(inputs `(("net-snmp" ,net-snmp)
,@(package-inputs keepalived-latest)))))
(inputs (modify-inputs (package-inputs keepalived-latest)
(prepend net-snmp)))))

View file

@ -111,10 +111,10 @@
(define-public rdma-core-latest
(latest-version local-rdma-core gnu:rdma-core))
(define-public libfabric-upstream-1.13.1
(define-public libfabric-upstream-1.17.0
(package
(inherit gnu:libfabric)
(version "1.13.1")
(version "1.17.0")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
@ -123,89 +123,21 @@
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf"))))))
(define-public libfabric-upstream-1.14.0
(package
(inherit gnu:libfabric)
(version "1.14.0")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw"))))))
(define-public libfabric-upstream-1.14.1
(package
(inherit gnu:libfabric)
(version "1.14.1")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"1vca7p5cczlrayglps8ibdy0fz9nb9pm04jj07cikr58pjabpykc"))))))
(define-public libfabric-upstream-1.15.0
(package
(inherit gnu:libfabric)
(version "1.15.0")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"1slvgih7y7mb30mvnvxm31k202z48pb3yh98vcfmpsyyx9c2r63h"))))))
(define-public libfabric-upstream-1.15.1
(package
(inherit gnu:libfabric)
(version "1.15.1")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna"))))
(inputs `(("util-linux:lib" ,util-linux "lib")
"0pblwkgbnpf40is3isn47andkbm5j7dd8srx9lpwgh1nyrg0z72p"))))
(inputs (modify-inputs (package-inputs gnu:libfabric)
(prepend `(,util-linux "lib")
;; uuid.h, numa.h
("numactl" ,gnu:numactl)
,@(package-inputs gnu:libfabric)))))
gnu:numactl)))))
(define-public libfabric-upstream-1.16.0
(package
(inherit gnu:libfabric)
(version "1.16.0")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c"))))
(inputs `(("util-linux:lib" ,util-linux "lib")
;; uuid.h, numa.h
("numactl" ,gnu:numactl)
,@(package-inputs gnu:libfabric)))))
(define local-libfabric
libfabric-upstream-1.17.0)
(define-public libfabric-latest
(latest-version local-libfabric gnu:libfabric))
(define-public libfabric-upstream-1.16.1
(package
(inherit gnu:libfabric)
(inherit local-libfabric)
(version "1.16.1")
(name (string-append (package-name gnu:libfabric) "-upstream"))
(source (origin
@ -215,17 +147,7 @@
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))
(inputs `(("util-linux:lib" ,util-linux "lib")
;; uuid.h, numa.h
("numactl" ,gnu:numactl)
,@(package-inputs gnu:libfabric)))))
(define local-libfabric
libfabric-upstream-1.16.1)
(define-public libfabric-latest
(latest-version local-libfabric gnu:libfabric))
"0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))))
(define-public psm2-upstream-11.2.228
(package

View file

@ -41,9 +41,8 @@
(description "MPIX. More to come. FIXIT")
(home-page "https://www.gnu.org/software/hello/")
(license license:gpl3+)
(inputs `(("libevent" ,libevent)
("hwloc" ,hwloc-2 "lib")
("perl" ,perl)))))
(inputs (list libevent
`(,hwloc-2 "lib") perl))))
(define-public openpmix-4.1.0
(package
@ -57,10 +56,8 @@
(sha256
(base32
"0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql"))))
(inputs `(("python" ,python)
("zlib" ,zlib)
("pandoc" ,pandoc)
,@(package-inputs openpmix-3.1.5)))))
(inputs (modify-inputs (package-inputs openpmix-3.1.5)
(prepend python zlib pandoc)))))
(define-public openpmix
openpmix-4.1.0)
@ -86,8 +83,8 @@
(package
(inherit slurm-20.02-latest)
(name "slurm-glicid")
(inputs `(("gtk+-2" ,gtk+-2)
("mariadb:dev" ,mariadb "dev")
(inputs `(("gtk+" ,gtk+-2)
("mariadb" ,mariadb "dev")
,@(package-inputs slurm-20.02-latest)))))
(define-public slurm-20.11-upstream
@ -113,8 +110,8 @@
(package
(inherit slurm-20.11-latest)
(name "slurm-glicid")
(inputs `(("gtk+-2" ,gtk+-2)
("mariadb:dev" ,mariadb "dev")
(inputs `(("gtk+" ,gtk+-2)
("mariadb" ,mariadb "dev")
,@(package-inputs slurm-20.11-latest)))))
(define-public slurm-21.08-upstream
@ -137,8 +134,8 @@
(package
(inherit slurm-21.08-latest)
(name "slurm-glicid")
(inputs `(("gtk+-2" ,gtk+-2)
("mariadb:dev" ,mariadb "dev")
(inputs `(("gtk+" ,gtk+-2)
("mariadb" ,mariadb "dev")
,@(package-inputs slurm-21.08-latest)))))
(define-public slurm-22.05-upstream
@ -161,8 +158,8 @@
(package
(inherit slurm-22.05-latest)
(name "slurm-glicid")
(inputs `(("gtk+-2" ,gtk+-2)
("mariadb:dev" ,mariadb "dev")
(inputs `(("gtk+" ,gtk+-2)
("mariadb" ,mariadb "dev")
,@(package-inputs slurm-22.05-latest)))))
(define-public slurm-23.02-upstream
@ -188,13 +185,13 @@
(package
(inherit slurm-23.02-latest)
(name "slurm-glicid")
(inputs `(("gtk+-2" ,gtk+-2)
("mariadb:dev" ,mariadb "dev")
("ucx" ,ucx-latest-glicid) ;not autotested by config
("podman" ,podman)
("lua" ,lua)
("lz4" ,lz4)
,@(package-inputs slurm-23.02-latest)))))
(inputs (modify-inputs (package-inputs slurm-23.02-latest)
(prepend gtk+-2
`(,mariadb "dev")
ucx-latest-glicid ;not autotested by config
podman
lua
lz4)))))
(define-public slurm-glicid
slurm-22.05-glicid)
@ -205,5 +202,3 @@
(define-public slurm-glicid-test
slurm-23.02-glicid)
slurm-glicid-test