From 64f646fc688a0d15e69c511a7eb18d410b01251b Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 2 Jan 2023 14:46:00 +0100 Subject: [PATCH 1/2] bump slurm version --- glicid/packages/parallel.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index 633a5db..f1aa47c 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -83,9 +83,9 @@ (package (inherit slurm-20.02-latest) (name "slurm-glicid") - (inputs `(("gtk+" ,gtk+-2) - ("mariadb" ,mariadb "dev") - ,@(package-inputs slurm-20.02-latest))))) + (inputs (modify-inputs (package-inputs slurm-20.02-latest) + (prepend gtk+-2 + `(,mariadb "dev")))))) (define-public slurm-20.11-upstream (package @@ -110,9 +110,9 @@ (package (inherit slurm-20.11-latest) (name "slurm-glicid") - (inputs `(("gtk+" ,gtk+-2) - ("mariadb" ,mariadb "dev") - ,@(package-inputs slurm-20.11-latest))))) + (inputs (modify-inputs (package-inputs slurm-20.11-latest) + (prepend gtk+-2 + `(,mariadb "dev")))))) (define-public slurm-21.08-upstream (package @@ -134,22 +134,23 @@ (package (inherit slurm-21.08-latest) (name "slurm-glicid") - (inputs `(("gtk+" ,gtk+-2) - ("mariadb" ,mariadb "dev") - ,@(package-inputs slurm-21.08-latest))))) + + (inputs (modify-inputs (package-inputs slurm-21.08-latest) + (prepend gtk+-2 + `(,mariadb "dev")))))) (define-public slurm-22.05-upstream (package (inherit slurm) (name "slurm-upstream") - (version "22.05.5") + (version "22.05.7") (source (origin (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) (sha256 (base32 - "1khglnjhnfd7k9x6c5kn40zalvcq0nxinxv5z04p82vw9y6ck1zn")))))) + "0gihqcp8b87jqi9yix0zixg2lnsgkzn0s11lgfffamjxwm2jb9xw")))))) (define slurm-22.05-latest (latest-version slurm slurm-22.05-upstream)) @@ -158,9 +159,9 @@ (package (inherit slurm-22.05-latest) (name "slurm-glicid") - (inputs `(("gtk+" ,gtk+-2) - ("mariadb" ,mariadb "dev") - ,@(package-inputs slurm-22.05-latest))))) + (inputs (modify-inputs (package-inputs slurm-22.05-latest) + (prepend gtk+-2 + `(,mariadb "dev")))))) (define-public slurm-23.02-upstream (package From d64f855665c176d02d09e0e2d0e0c28f99e53cff Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 2 Jan 2023 14:46:20 +0100 Subject: [PATCH 2/2] guix style. --- glicid/packages/parallel.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index f1aa47c..fde5fdc 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -135,7 +135,7 @@ (inherit slurm-21.08-latest) (name "slurm-glicid") - (inputs (modify-inputs (package-inputs slurm-21.08-latest) + (inputs (modify-inputs (package-inputs slurm-21.08-latest) (prepend gtk+-2 `(,mariadb "dev"))))))