Merge branch 'devel' into 'main'

Devel

See merge request glicid-public/guix-glicid!171
This commit is contained in:
Yann Dupont 2023-01-02 13:47:02 +00:00
commit 009b4793b3

View file

@ -83,9 +83,9 @@
(package (package
(inherit slurm-20.02-latest) (inherit slurm-20.02-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `(("gtk+" ,gtk+-2) (inputs (modify-inputs (package-inputs slurm-20.02-latest)
("mariadb" ,mariadb "dev") (prepend gtk+-2
,@(package-inputs slurm-20.02-latest))))) `(,mariadb "dev"))))))
(define-public slurm-20.11-upstream (define-public slurm-20.11-upstream
(package (package
@ -110,9 +110,9 @@
(package (package
(inherit slurm-20.11-latest) (inherit slurm-20.11-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `(("gtk+" ,gtk+-2) (inputs (modify-inputs (package-inputs slurm-20.11-latest)
("mariadb" ,mariadb "dev") (prepend gtk+-2
,@(package-inputs slurm-20.11-latest))))) `(,mariadb "dev"))))))
(define-public slurm-21.08-upstream (define-public slurm-21.08-upstream
(package (package
@ -134,22 +134,23 @@
(package (package
(inherit slurm-21.08-latest) (inherit slurm-21.08-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `(("gtk+" ,gtk+-2)
("mariadb" ,mariadb "dev") (inputs (modify-inputs (package-inputs slurm-21.08-latest)
,@(package-inputs slurm-21.08-latest))))) (prepend gtk+-2
`(,mariadb "dev"))))))
(define-public slurm-22.05-upstream (define-public slurm-22.05-upstream
(package (package
(inherit slurm) (inherit slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "22.05.5") (version "22.05.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" (uri (string-append "https://download.schedmd.com/slurm/slurm-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1khglnjhnfd7k9x6c5kn40zalvcq0nxinxv5z04p82vw9y6ck1zn")))))) "0gihqcp8b87jqi9yix0zixg2lnsgkzn0s11lgfffamjxwm2jb9xw"))))))
(define slurm-22.05-latest (define slurm-22.05-latest
(latest-version slurm slurm-22.05-upstream)) (latest-version slurm slurm-22.05-upstream))
@ -158,9 +159,9 @@
(package (package
(inherit slurm-22.05-latest) (inherit slurm-22.05-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `(("gtk+" ,gtk+-2) (inputs (modify-inputs (package-inputs slurm-22.05-latest)
("mariadb" ,mariadb "dev") (prepend gtk+-2
,@(package-inputs slurm-22.05-latest))))) `(,mariadb "dev"))))))
(define-public slurm-23.02-upstream (define-public slurm-23.02-upstream
(package (package