reformating files

This commit is contained in:
Jean-François GUILLAUME 2025-02-10 11:56:34 +01:00
parent 263fc568f0
commit 394c22c279
2 changed files with 137 additions and 275 deletions

View file

@ -24,12 +24,8 @@
(version "4.13") (version "4.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append (uri (list (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz")))
"https://github.com/shadow-maint/shadow/releases/download/v" (sha256 (base32 "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))))
version "/shadow-" version ".tar.xz")))
(sha256
(base32
"0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))))
(define-public sudo (define-public sudo
(let* ((sudo-minimal gnu:sudo)) (let* ((sudo-minimal gnu:sudo))
@ -39,7 +35,9 @@
(arguments (arguments
(substitute-keyword-arguments (package-arguments sudo-minimal) (substitute-keyword-arguments (package-arguments sudo-minimal)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list "--enable-sasl" "--with-ldap" "--enable-openssl" `(append (list "--enable-sasl"
"--with-ldap"
"--enable-openssl"
"--with-nsswitch") "--with-nsswitch")
,flags)))) ,flags))))
(inputs (modify-inputs (package-inputs sudo-minimal) (inputs (modify-inputs (package-inputs sudo-minimal)
@ -55,9 +53,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm"))))
(base32
"09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm"))))
(propagated-inputs (list ansible-core)))) (propagated-inputs (list ansible-core))))
(define-public ansible-core (define-public ansible-core
@ -68,20 +64,18 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf"))))
(base32
"120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf"))))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'sanity-check)))))) (delete 'sanity-check))))))
;(define-public munge ;(define-public munge-5.16
; (package ; (package
; (inherit gnu:munge) ; (inherit gnu:munge)
; (name "munge") ; (name "munge")
; (version "0.5.15") ; (version "0.5.16")
; (source (origin ; (source (origin
; (method url-fetch) ; (method url-fetch)
; (uri (string-append "https://github.com/dun/munge/releases/download/munge-" version "/munge-" version ".tar.xz")) ; (uri (string-append "https://github.com/dun/munge/releases/download/munge-" version "/munge-" version ".tar.xz"))
; (sha256 (base32 "1fm93pslfdbwm661c3vx7f7b1pjb0hhmb0z2izdp8k532zqrv5rz" )))))) ; (sha256 (base32 "0q98d9z85cixhrh49i8j754azqhxmpvjsn92cjsw4r0hwi6z39kg"))))))

View file

@ -1,291 +1,159 @@
(define-module (glicid packages parallel) (define-module (glicid packages parallel)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:prefix license:) #:use-module ((gnu packages parallel) #:prefix gnu:)
#:use-module ((gnu packages parallel) #:use-module (gnu packages gtk)
#:prefix gnu:) #:use-module (gnu packages libevent)
#:use-module (gnu packages gtk) #:use-module (gnu packages perl)
#:use-module (gnu packages libevent) #:use-module (gnu packages python)
#:use-module (gnu packages perl) #:use-module (gnu packages compression)
#:use-module (gnu packages python) #:use-module (gnu packages mpi)
#:use-module (gnu packages compression) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages mpi) #:use-module (gnu packages databases)
#:use-module (gnu packages haskell-xyz) #:use-module (glicid utils)
#:use-module (gnu packages databases) #:use-module (gnu packages fabric-management)
#:use-module (glicid utils) #:use-module (glicid packages containers)
; #:use-module (glicid packages fabric-management) ;for latest ucx #:use-module (gnu packages compression)
#:use-module (gnu packages fabric-management) #:use-module (gnu packages lua)
#:use-module (glicid packages containers) ;for latest podman #:use-module (gnu packages web)
#:use-module (gnu packages compression) ;lz4 #:use-module (gnu packages serialization)
#:use-module (gnu packages lua) ;lua #:use-module ((guix utils) #:select (target-64bit?))
#:use-module (gnu packages web) ;json-c, http-parser for slurm REST API )
#:use-module (gnu packages serialization) ;libyaml for slurm REST API
#:use-module ((guix utils)
#:select (target-64bit?))
)
(define-public openpmix-3.2.5 (define-public openpmix-3.2.5
(package (package
(name "openpmix-3") (name "openpmix-3")
(version "3.2.5") (version "3.2.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/openpmix/openpmix/releases/download/v" version "/pmix-" version ".tar.bz2"))
"https://github.com/openpmix/openpmix/releases/download/v" (sha256
version "/pmix-" version ".tar.bz2")) (base32
(sha256 "13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv"))))
(base32 (build-system gnu-build-system)
"13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv")))) (arguments
(build-system gnu-build-system) `(#:configure-flags (list (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")))))
(arguments (synopsis "MPIX lib")
`(#:configure-flags (list (string-append "--with-hwloc=" (description "MPIX. More to come. FIXIT")
(assoc-ref %build-inputs "hwloc"))))) (home-page "https://www.gnu.org/software/hello/")
(synopsis "MPIX lib") (license license:gpl3+)
(description "MPIX. More to come. FIXIT") (inputs (list libevent
(home-page "https://www.gnu.org/software/hello/") `(,hwloc-2 "lib") perl))))
(license license:gpl3+)
(inputs (list libevent
`(,hwloc-2 "lib") perl))))
(define-public openpmix-3 (define-public openpmix-3
openpmix-3.2.5) openpmix-3.2.5)
;(define-public openpmix
; openpmix-3)
; compat with nautilus…
(define-public slurm-upstream-22.05 (define-public slurm-upstream-22.05
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "22.05.11") (version "22.05.11")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
".tar.bz2")) (sha256 (base32 "19kqj06f39kad21wp9b9j82x3zm2w2h8mcjr2zvs1q1rzjmhr1nb"))))))
(sha256
(base32 "19kqj06f39kad21wp9b9j82x3zm2w2h8mcjr2zvs1q1rzjmhr1nb"))))))
(define slurm-22.05-latest (define slurm-22.05-latest (latest-version gnu:slurm-22.05 slurm-upstream-22.05))
(latest-version gnu:slurm-22.05 slurm-upstream-22.05))
(define-public slurm-upstream-23.02 (define-public slurm-upstream-23.02
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "23.02.8") (version "23.02.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
".tar.bz2")) (sha256 (base32 "0vh0lbqp315cgcm2wpfg8j718d84lfqr474rfzk46ail5pk0d9vl"))))))
(sha256
(base32 "0vh0lbqp315cgcm2wpfg8j718d84lfqr474rfzk46ail5pk0d9vl"))))))
(define-public slurm-upstream-23.11 (define-public slurm-upstream-23.11
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "23.11.10") (version "23.11.10")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
".tar.bz2")) (sha256 (base32 "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr"))))))
(sha256
(base32 "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr"))))))
(define-public slurm-upstream-24.05 (define-public slurm-upstream-24.05
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "24.05.5") (version "24.05.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
".tar.bz2")) (sha256 (base32 "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl"))))))
(sha256
(base32 "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl"))))))
(define-public slurm-upstream-24.11 (define-public slurm-upstream-24.11
(package (package
(inherit gnu:slurm) (inherit gnu:slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "24.11.0") (version "24.11.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2"))
".tar.bz2")) (sha256 (base32 "0mlhqsyn3sc59wjg47wk20aw9rxz379rnqpjny8f0x6qnppfxsrr"))))))
(sha256
(base32 "0mlhqsyn3sc59wjg47wk20aw9rxz379rnqpjny8f0x6qnppfxsrr"))))))
;(define-public slurm-22.05-glicid-std
; (package
; (inherit slurm-22.05-latest)
; (name "slurm-glicid-noucx-nopmix")
; (inputs (modify-inputs (package-inputs slurm-22.05-latest)
; (prepend gtk+-2 ;for sview
; ucx
; openpmix-3 ;for pmix support
; json-c
; libjwt
; libyaml
; http-parser ;for REST API
; `(,mariadb "dev"))))))
; for mariadb/mysql client support
;(define-public slurm-22.05-glicid
; (package
; (inherit slurm-22.05-glicid-std)
; (version "22.05.11")
; (name "slurm-glicid")
; (arguments
; (list
; #:configure-flags #~(list "--enable-pam"
; "--sysconfdir=/etc/slurm"
; "--disable-static"
; (string-append "--with-freeipmi="
; #$(this-package-input
; "freeipmi"))
; (string-append "--with-hwloc="
; (ungexp (this-package-input
; "hwloc") "lib"))
; (string-append "--with-json="
; #$(this-package-input "json-c"))
; (string-append "--with-munge="
; #$(this-package-input "munge"))
; ;; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") )
; (string-append "--with-pmix="
; #$(this-package-input
; "openpmix-3"))
; (string-append "--with-yaml="
; #$(this-package-input "libyaml"))
; (string-append "--with-jwt="
; #$(this-package-input "libjwt"))
; (string-append "--with-http-parser="
; #$(this-package-input
; "http-parser"))
; (string-append "--with-ucx="
; #$(this-package-input "ucx"))
; ;; (string-append "--with-pmix=" #$(this-package-input "openpmix-4"))
; ;; 32-bit support is marked as deprecated and needs to be
; ;; explicitly enabled.
; #$@(if (target-64bit?)
; '()
; '("--enable-deprecated")))
; #:phases #~(modify-phases %standard-phases
; (add-after 'unpack 'patch-plugin-linker-flags
; (lambda _
; (substitute* (find-files "src/plugins/" "Makefile.in")
; (("_la_LDFLAGS = ")
; "_la_LDFLAGS = ../../../api/libslurm.la "))))
; (add-after 'patch-plugin-linker-flags 'autoconf
; (lambda _
; (invoke "autoconf"))) ;configure.ac was patched
; (add-after 'install 'install-libpmi
; (lambda _
; ;; Open MPI expects libpmi to be provided by Slurm so install it.
; (invoke "make" "install" "-C" "contribs/pmi")
;
; ;; Others expect pmi2.
; (invoke "make" "install" "-C" "contribs/pmi2"))))))))
;(define slurm-23.02-latest
; (latest-version gnu:slurm slurm-upstream-23.02))
;(define-public slurm-23.02-glicid
; (package
; (inherit slurm-23.02-latest)
; (name "slurm-upstream-glicid")
; (inputs (modify-inputs (package-inputs slurm-23.02-latest)
; (prepend gtk+-2
; `(,mariadb "dev")
; ucx-latest-glicid ;not autotested by config
; podman
; lua
; lz4)))))
(define (make-slurm-glicid base-package) (define (make-slurm-glicid base-package)
(package (package
(inherit base-package) (inherit base-package)
(name "slurm-glicid") (name "slurm-glicid")
(arguments (arguments
(list (list
#:configure-flags #~(list "--enable-pam" #:configure-flags #~(list "--enable-pam"
"--sysconfdir=/etc/slurm" "--sysconfdir=/etc/slurm"
"--disable-static" "--disable-static"
(string-append "--with-freeipmi=" (string-append "--with-freeipmi=" #$(this-package-input "freeipmi"))
#$(this-package-input (string-append "--with-hwloc=" (ungexp (this-package-input "hwloc") "lib"))
"freeipmi")) (string-append "--with-json=" #$(this-package-input "json-c"))
(string-append "--with-hwloc=" (string-append "--with-munge=" #$(this-package-input "munge"))
(ungexp (this-package-input (string-append "--with-yaml=" #$(this-package-input "libyaml"))
"hwloc") "lib")) (string-append "--with-jwt=" #$(this-package-input "libjwt"))
(string-append "--with-json=" (string-append "--with-http-parser=" #$(this-package-input "http-parser"))
#$(this-package-input "json-c")) (string-append "--with-ucx=" #$(this-package-input "ucx"))
(string-append "--with-munge=" (string-append "--with-pmix=" #$(this-package-input "openpmix"))
#$(this-package-input "munge")) #$@(if (target-64bit?)
;; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") )
;; (string-append "--with-pmix=" #$(this-package-input "openpmix-3"))
(string-append "--with-yaml="
#$(this-package-input "libyaml"))
(string-append "--with-jwt="
#$(this-package-input "libjwt"))
(string-append "--with-http-parser="
#$(this-package-input
"http-parser"))
(string-append "--with-ucx="
#$(this-package-input "ucx"))
(string-append "--with-pmix="
#$(this-package-input
"openpmix"))
;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled.
#$@(if (target-64bit?)
'() '()
'("--enable-deprecated"))) '("--enable-deprecated")))
#:phases #~(modify-phases %standard-phases #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-plugin-linker-flags (add-after 'unpack 'patch-plugin-linker-flags
(lambda _ (lambda _
(substitute* (find-files "src/plugins/" "Makefile.in") (substitute* (find-files "src/plugins/" "Makefile.in")
(("_la_LDFLAGS = ") (("_la_LDFLAGS = ")
"_la_LDFLAGS = ../../../api/libslurm.la ")))) "_la_LDFLAGS = ../../../api/libslurm.la "))))
(add-after 'patch-plugin-linker-flags 'autoconf (add-after 'patch-plugin-linker-flags 'autoconf
(lambda _ (lambda _
(invoke "autoconf"))) ;configure.ac was patched (invoke "autoconf")))
(add-after 'install 'install-libpmi (add-after 'install 'install-libpmi
(lambda _ (lambda _
;; Open MPI expects libpmi to be provided by Slurm so install it. (invoke "make" "install" "-C" "contribs/pmi")
(invoke "make" "install" "-C" "contribs/pmi") (invoke "make" "install" "-C" "contribs/pmi2"))))))
(inputs (modify-inputs (package-inputs base-package)
;; Others expect pmi2. (prepend gtk+-2
(invoke "make" "install" "-C" "contribs/pmi2")))))) ucx gnu:openpmix
(inputs (modify-inputs (package-inputs base-package) json-c
(prepend gtk+-2 ;for sview libjwt
ucx gnu:openpmix ;for pmix support libyaml
json-c http-parser
libjwt `(,mariadb "dev"))))))
libyaml
http-parser ;for REST API
`(,mariadb "dev")))))) ; for mariadb/mysql client support
(define-public slurm-glicid-22.05 (make-slurm-glicid slurm-upstream-22.05)) (define-public slurm-glicid-22.05 (make-slurm-glicid slurm-upstream-22.05))
(define-public slurm-glicid-23.11 (make-slurm-glicid slurm-upstream-23.11)) (define-public slurm-glicid-23.11 (make-slurm-glicid slurm-upstream-23.11))
(define-public slurm-glicid-24.11 (make-slurm-glicid slurm-upstream-24.11)) (define-public slurm-glicid-24.11 (make-slurm-glicid slurm-upstream-24.11))
(define-public slurm-glicid slurm-glicid-24.11)
(define-public slurm-glicid slurm-glicid-24.11) (define-public slurm-ccipl slurm-glicid-22.05)
(define-public slurm-ccipl slurm-glicid-22.05)
(define-public slurm-glicid-preprod slurm-glicid-24.11) (define-public slurm-glicid-preprod slurm-glicid-24.11)
(define-public slurm-glicid-test slurm-glicid-24.11) (define-public slurm-glicid-test slurm-glicid-24.11)