diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index 190c4b8..d7d64c8 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -153,64 +153,70 @@ (define-public openpmix openpmix-4.1.0) -(define-public slurm-19.05-glicid - (package - (inherit slurm) - (name "slurm-glicid") - (version "19.05.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) - )) - (arguments - `(#:configure-flags - (list "--enable-pam" "--sysconfdir=/etc/slurm" - "--disable-static" - (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi")) - (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")) - (string-append "--with-json=" (assoc-ref %build-inputs "json-c")) - (string-append "--with-munge=" (assoc-ref %build-inputs "munge")) -; (string-append "--with-pmix=" (assoc-ref %build-inputs "openpmix")) - - ;; 32-bit support is marked as deprecated and needs to be - ;; explicitly enabled. - ;;;; ,@(if (target-64bit?) '() '("--enable-deprecated")) - - ) - ) - ) - - (inputs `(("gtk+-2" ,gtk+-2) -; ("gcc", gcc-11) -; ("openpmix", openpmix) -; ("glicid-specific-openmpi", glicid-specific-openmpi) - ,@(package-inputs slurm) - - - )) -; (propagated-inputs -; `( -; ("sssd" ,sssd) -; )) - -)) +;(define-public slurm-19.05-glicid +; (package +; (inherit slurm) +; (name "slurm-glicid") +; (version "19.05.6") +; (source +; (origin +; (method url-fetch) +; (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) +; (sha256 (base32 "1kj79r8hng5gp98ickgvj3im4gr19nzd3p3p8g6rl75axb8jin7h")) +; )) +; (arguments +; `(#:configure-flags +; (list "--enable-pam" "--sysconfdir=/etc/slurm" +; "--disable-static" +; (string-append "--with-freeipmi=" (assoc-ref %build-inputs "freeipmi")) +; (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")) +; (string-append "--with-json=" (assoc-ref %build-inputs "json-c")) +; (string-append "--with-munge=" (assoc-ref %build-inputs "munge")) +;; (string-append "--with-pmix=" (assoc-ref %build-inputs "openpmix")) +; +; ;; 32-bit support is marked as deprecated and needs to be +; ;; explicitly enabled. +; ;;;; ,@(if (target-64bit?) '() '("--enable-deprecated")) +; +; ) +; ) +; ) +; +; (inputs `(("gtk+-2" ,gtk+-2) +;; ("gcc", gcc-11) +;; ("openpmix", openpmix) +;; ("glicid-specific-openmpi", glicid-specific-openmpi) +; ,@(package-inputs slurm) +; +; +; )) +;; (propagated-inputs +;; `( +;; ("sssd" ,sssd) +;; )) +; +;)) (define-public slurm-20.02-glicid (package - (inherit slurm-19.05-glicid) + (inherit slurm-20.02) (name "slurm-glicid") (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")) )) -)) + (inputs `(("gtk+-2" ,gtk+-2) ;; for sview + ,@(package-inputs slurm-20.02) + + )) + ) +) (define-public slurm-20.11-glicid (package