slurm-glicid hadn't all inherited patches

This commit is contained in:
Yann Dupont 2021-11-29 17:37:28 +01:00
parent ad9bf3d050
commit 9bbb120b9c

View file

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