diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index f0debf4..689cec1 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -6,7 +6,7 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages parallel) + #:use-module ((gnu packages parallel) #:prefix gnu:) #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) #:use-module (gnu packages perl) @@ -119,86 +119,9 @@ (define-public openpmix openpmix-3) ; compat with nautilus… -(define-public slurm-20.02-upstream - (package - (inherit slurm-20.02) - (name "slurm-upstream") - (version "20.02.7") - (source (origin - (inherit (package-source slurm-20.02)) - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")))))) - -(define slurm-20.02-latest - (latest-version slurm-20.02 slurm-20.02-upstream)) - -(define-public slurm-20.02-glicid - (package - (inherit slurm-20.02-latest) - (name "slurm-glicid") - (inputs (modify-inputs (package-inputs slurm-20.02-latest) - (prepend gtk+-2 - `(,mariadb "dev")))))) - -(define-public slurm-20.11-upstream - (package - (inherit slurm-20.11) - (name "slurm-upstream") - (version "20.11.9") - (source (origin - (inherit (package-source slurm-20.11)) - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m")) - - )))) - -(define slurm-20.11-latest - (latest-version slurm-20.11 slurm-20.11-upstream)) - -(define-public slurm-20.11-glicid - (package - (inherit slurm-20.11-latest) - (name "slurm-glicid") - (inputs (modify-inputs (package-inputs slurm-20.11-latest) - (prepend gtk+-2 - `(,mariadb "dev")))))) - -(define-public slurm-21.08-upstream - (package - (inherit slurm) - (name "slurm-upstream") - (version "21.08.8-2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" - version ".tar.bz2")) - (sha256 - (base32 - "01lynxvfzjswq5zxfxzjqjalj1s596lh58f5g8xqb6as9gdcyzgg")))))) - -(define slurm-21.08-latest - (latest-version slurm slurm-21.08-upstream)) - -(define-public slurm-21.08-glicid - (package - (inherit slurm-21.08-latest) - (name "slurm-glicid") - - (inputs (modify-inputs (package-inputs slurm-21.08-latest) - (prepend gtk+-2 - `(,mariadb "dev")))))) - (define-public slurm-22.05-upstream (package - (inherit slurm) + (inherit gnu:slurm) (name "slurm-upstream") (version "22.05.10") (source (origin @@ -210,7 +133,7 @@ "0vjc2kc9blky6y222db21rm15yqqijyv28kwp734c5acc4mdmqac")))))) (define slurm-22.05-latest - (latest-version slurm-22.05 slurm-22.05-upstream)) + (latest-version gnu:slurm-22.05 slurm-22.05-upstream)) (define-public slurm-22.05-glicid-std (package @@ -266,7 +189,7 @@ (define-public slurm-23.02-upstream (package - (inherit slurm) + (inherit gnu:slurm) (name "slurm-upstream") (version "23.02.0") ; (source (origin @@ -290,7 +213,7 @@ (define slurm-23.02-latest - (latest-version slurm slurm-23.02-upstream)) + (latest-version gnu:slurm slurm-23.02-upstream)) (define-public slurm-23.02-glicid (package