GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change input to new-style def

Browse source
This commit is contained in:
Yann Dupont 2023-01-02 11:45:53 +01:00
parent 09e78ddc85
commit 65ca6fb4ae
3 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glicid/packages/cluster.scm
View file

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

24
glicid/packages/linux.scm
View file

@ -180,10 +180,10 @@
(sha256 (sha256
(base32 (base32
"1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna")))) "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna"))))
(inputs `(("util-linux:lib" ,util-linux "lib") (inputs (modify-inputs (package-inputs gnu:libfabric)
;; uuid.h, numa.h (prepend `(,util-linux "lib")
("numactl" ,gnu:numactl) ;; uuid.h, numa.h
,@(package-inputs gnu:libfabric))))) gnu:numactl)))))
(define-public libfabric-upstream-1.16.0 (define-public libfabric-upstream-1.16.0
(package (package
@ -198,10 +198,10 @@
(sha256 (sha256
(base32 (base32
"1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c")))) "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c"))))
(inputs `(("util-linux:lib" ,util-linux "lib") (inputs (modify-inputs (package-inputs gnu:libfabric)
;; uuid.h, numa.h (prepend `(,util-linux "lib")
("numactl" ,gnu:numactl) ;; uuid.h, numa.h
,@(package-inputs gnu:libfabric))))) gnu:numactl)))))
(define-public libfabric-upstream-1.16.1 (define-public libfabric-upstream-1.16.1
(package (package
@ -216,10 +216,10 @@
(sha256 (sha256
(base32 (base32
"0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")))) "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))
(inputs `(("util-linux:lib" ,util-linux "lib") (inputs (modify-inputs (package-inputs gnu:libfabric)
;; uuid.h, numa.h (prepend `(,util-linux "lib")
("numactl" ,gnu:numactl) ;; uuid.h, numa.h
,@(package-inputs gnu:libfabric))))) gnu:numactl)))))
(define local-libfabric (define local-libfabric
libfabric-upstream-1.16.1) libfabric-upstream-1.16.1)

43
glicid/packages/parallel.scm
View file

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