Merge branch 'main' into devel

This commit is contained in:
Yann Dupont 2025-02-10 14:15:46 +01:00
commit e254f0439d
46 changed files with 10569 additions and 12131 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

@ -11,10 +11,7 @@
(version "3.3.10") (version "3.3.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.fftw.org/fftw-" version (uri (string-append "https://www.fftw.org/fftw-" version ".tar.gz"))
".tar.gz")) (sha256 (base32 "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan"))))
(sha256
(base32
"0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan"))))
(inputs `(("gfortran-toolchain" ,gfortran-toolchain) (inputs `(("gfortran-toolchain" ,gfortran-toolchain)
,@(package-inputs fftw-openmpi))))) ,@(package-inputs fftw-openmpi)))))

View file

@ -100,8 +100,7 @@
(inputs (list (list zstd "lib"))) (inputs (list (list zstd "lib")))
(home-page "https://rustic.cli.rs/") (home-page "https://rustic.cli.rs/")
(synopsis "rustic - fast, encrypted, deduplicated backups powered by Rust") (synopsis "rustic - fast, encrypted, deduplicated backups powered by Rust")
(description (description "This package provides rustic - fast, encrypted, deduplicated backups powered by Rust.")
"This package provides rustic - fast, encrypted, deduplicated backups powered by Rust.")
(license (list license:asl2.0 license:expat)))) (license (list license:asl2.0 license:expat))))
rust-rustic-rs-0.9 rust-rustic-rs-0.9

View file

@ -1,6 +1,9 @@
(define-module (glicid packages base)) (define-module (glicid packages base)
#:use-module (guix packages)
(use-modules (guix packages) (gnu packages cpp) (gnu packages base) (gnu packages pcre)) #:use-module (gnu packages cpp)
#:use-module (gnu packages base)
#:use-module (gnu packages pcre)
)
(define-public grep-glicid (define-public grep-glicid
(package (package
@ -8,9 +11,4 @@
(name "grep-glicid") (name "grep-glicid")
(inputs (list pcre2)) (inputs (list pcre2))
(arguments (arguments
`(#:configure-flags `(#:configure-flags (list "--enable-perl-regexp") ))))
(list "--enable-perl-regexp")
))))
grep-glicid

View file

@ -2,17 +2,16 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module ((gnu packages benchmark) #:use-module ((gnu packages benchmark) #:prefix gnu:)
#:prefix gnu:)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (glicid packages mpi) #:use-module (glicid packages mpi)
#:use-module (glicid packages gcc) #:use-module (glicid packages gcc)
#:use-module (glicid utils)) #:use-module (glicid utils)
)
(define-public intel-mpi-benchmarks/openmpi-2021.3 (define-public intel-mpi-benchmarks/openmpi-2021.3
(package (package
@ -26,31 +25,7 @@
(url "https://github.com/intel/mpi-benchmarks") (url "https://github.com/intel/mpi-benchmarks")
(commit (string-append "IMB-v" version)))) (commit (string-append "IMB-v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))))))
(base32
"04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))))))
;(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma
; (transform-package (
; (instead-of "openmpi" openmpi-glicid-waves)
; intel-mpi-benchmarks/openmpi-2021.3
; ) "fab+rdma+ucx+psm2")
;)
;(define intel-mpi-benchmark-transform-gcc-11
; (gcc11-instead-of-gcc intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma)
;)
;(define intel-mpi-benchmarks/openmpi-2021.3-gcc-11
; (package
; (inherit intel-mpi-benchmark-transform-gcc-11)
; (version (string-append (package-version intel-mpi-benchmark-transform-gcc-11) "-gcc-11" ))
; )
;)
;(define-public intel-mpi-benchmarks/openmpi-2021.3-waves
; (transform-package ((instead-of "openmpi" openmpi-glicid-waves)
; intel-mpi-benchmarks/openmpi-2021.3) "waves"))
(define-public stream-benchmarks (define-public stream-benchmarks
(package (package
@ -61,19 +36,15 @@
(uri (git-reference (uri (git-reference
(url "https://github.com/jeffhammond/STREAM.git") (url "https://github.com/jeffhammond/STREAM.git")
(commit "HEAD"))) (commit "HEAD")))
(sha256 (sha256 (base32 "1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m"))
(base32
"1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(delete 'configure) ;no configure (delete 'configure)
(delete 'check) ;no check (delete 'check)
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Le Makefile du paquet ne fournit pas de règle « install »
;; alors on le fait nous-mêmes.
(let ((bin (string-append (assoc-ref outputs "out") (let ((bin (string-append (assoc-ref outputs "out")
"/bin"))) "/bin")))
(install-file "stream_c.exe" bin) (install-file "stream_c.exe" bin)
@ -82,10 +53,7 @@
(synopsis "STREAM benchmark") (synopsis "STREAM benchmark")
(description "STREAM benchmark") (description "STREAM benchmark")
(home-page "https://") (home-page "https://")
(license license:gpl2+) ;check… (license license:gpl2+)))
))
;;defined by gricad / PA Boutier
(define-public osu-benchmarks (define-public osu-benchmarks
(package (package
@ -93,21 +61,15 @@
(version "5.8") (version "5.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" version ".tgz"))
"https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" (sha256 (base32 "19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f"))))
version ".tgz"))
(sha256
(base32
"19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'setenv (add-after 'unpack 'setenv
(lambda _ (lambda _
(setenv "CC" (setenv "CC" (which "mpicc"))
(which "mpicc")) (setenv "CXX" (which "mpic++")) #t)))))
(setenv "CXX"
(which "mpic++")) #t)))))
(propagated-inputs `(("openmpi" ,openmpi))) (propagated-inputs `(("openmpi" ,openmpi)))
(synopsis "OSU micro benchmarks") (synopsis "OSU micro benchmarks")
(description "OSU micro benchmark for mpi") (description "OSU micro benchmark for mpi")

View file

@ -12,56 +12,60 @@
#:use-module (gnu packages golang-check) #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web) #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz) #:use-module (gnu packages golang-xyz)
) )
(define %caddy-version "2.9.1")
(define %caddy-synopsis "Caddy is an extensible server platform that uses TLS by default. Dirty Version.")
(define %caddy-description "Caddy is an extensible server platform that uses TLS by default. Dirty Version")
(define %caddy-homepage "https://github.com/caddyserver/caddy")
(define %glicid-caddy-homepage "https://forgejo.glicid.fr/GLiCID/caddy-for-guix")
(define-public caddy-dirty (define-public caddy-dirty
(package (package
(name "caddy-dirty") (name "caddy-dirty")
(version "2.8.4") (version %caddy-version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/caddyserver/caddy/releases/download/v" version "/caddy_" version "_linux_amd64.tar.gz")) (uri (string-append "https://github.com/caddyserver/caddy/releases/download/v" version "/caddy_" version "_linux_amd64.tar.gz"))
(sha256 (base32 "1j286xfxcrzvgn4k02nnq7n45wdsyz5c0phw6y7gi30kain31s57")))) (sha256 (base32 "166qbnpk8mb07sxbjkq9xi2j992jphmslz53wryrimp0bjxyshh5"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:install-plan `(("caddy" "/sbin/")))) `(#:install-plan `(("caddy" "/sbin/"))))
(synopsis "Caddy is an extensible server platform that uses TLS by default. Dirty Version.") (synopsis %caddy-synopsis)
(description "Caddy is an extensible server platform that uses TLS by default. Dirty Version") (description %caddy-description)
(home-page "https://github.com/caddyserver/caddy") (home-page %caddy-homepage)
(license license:expat))) (license license:expat)))
(define-public caddy-dirty-with-replace (define-public caddy-dirty-with-replace
(package (package
(name "caddy-dirty-with-replace") (name "caddy-dirty-with-replace")
(version "2.8.4") (version %caddy-version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://forgejo.glicid.fr/api/packages/GLiCID/generic/caddy-for-guix/v" version "/caddy-" version "-replaceresponse.tar.gz")) (uri (string-append "https://forgejo.glicid.fr/api/packages/GLiCID/generic/caddy-for-guix/v" version "/caddy-" version "-replaceresponse.tar.gz"))
(sha256 (base32 "16rbxld5pg7w1a7j22rfkaihs3867ign4qbml5a6psnn4v8blcxh")))) (sha256 (base32 "0yvbzq0bmfgk30idv10kx32w98h4i3gpj46yavsfmbd0wjp7pl78"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:install-plan `(("caddy" "/sbin/")))) `(#:install-plan `(("caddy" "/sbin/"))))
(synopsis "Caddy is an extensible server platform that uses TLS by default. Dirty Version.") (synopsis %caddy-synopsis)
(description "Caddy is an extensible server platform that uses TLS by default. Dirty Version") (description (string-append %caddy-description "With custom extensions. See homepage for more information."))
(home-page "https://github.com/caddyserver/caddy") (home-page %glicid-caddy-homepage)
(license license:expat))) (license license:expat)))
(define-public caddy-dirty-with-extensions (define-public caddy-dirty-with-extensions
(package (package
(name "caddy-dirty-with-extensions") (name "caddy-dirty-with-extensions")
(version "2.8.4") (version %caddy-version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://forgejo.glicid.fr/api/packages/GLiCID/generic/caddy-for-guix/v" version "/caddy-" version "-full.tar.gz")) (uri (string-append "https://forgejo.glicid.fr/api/packages/GLiCID/generic/caddy-for-guix/v" version "/caddy-" version "-full.tar.gz"))
(sha256 (base32 "0y4rsg94ngp85ma02axfdwfj72h1bwac3hf4kykym2dzyydgcvf7")))) (sha256 (base32 "06l54jqphm3dhyy73618wzihghw1j88kj2yyhkpvxcvb43gir10p"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
`(#:install-plan `(("caddy" "/sbin/")))) `(#:install-plan `(("caddy" "/sbin/"))))
(synopsis "Caddy is an extensible server platform that uses TLS by default. Dirty Version.") (synopsis %caddy-synopsis)
(description "Caddy is an extensible server platform that uses TLS by default. Dirty Version") (description (string-append %caddy-description "With custom extensions. See homepage for more information."))
(home-page "https://github.com/caddyserver/caddy") (home-page %glicid-caddy-homepage)
(license license:expat))) (license license:expat)))
(define-public go-github-com-akavel-rsrc (define-public go-github-com-akavel-rsrc
@ -75,8 +79,7 @@
(url "https://github.com/akavel/rsrc") (url "https://github.com/akavel/rsrc")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "1frdxqdnk923p4245lk0wwqrxsdy8aj2qxl3m0zfgnh02vfz3hs2"))))
(base32 "1frdxqdnk923p4245lk0wwqrxsdy8aj2qxl3m0zfgnh02vfz3hs2"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
@ -97,8 +100,7 @@
(url "https://github.com/josephspurrier/goversioninfo") (url "https://github.com/josephspurrier/goversioninfo")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "02nqhkvsxi69ny64j81x1k142fir2ps68fypi3z2hr4wd3x4i1l9"))))
(base32 "02nqhkvsxi69ny64j81x1k142fir2ps68fypi3z2hr4wd3x4i1l9"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
@ -107,8 +109,7 @@
go-github-com-akavel-rsrc)) go-github-com-akavel-rsrc))
(home-page "https://github.com/josephspurrier/goversioninfo") (home-page "https://github.com/josephspurrier/goversioninfo")
(synopsis "GoVersionInfo") (synopsis "GoVersionInfo")
(description (description "Package goversioninfo creates a syso file which contains Microsoft Version
"Package goversioninfo creates a syso file which contains Microsoft Version
Information and an optional icon.") Information and an optional icon.")
(license license:expat))) (license license:expat)))
@ -123,8 +124,7 @@ Information and an optional icon.")
(url "https://github.com/caddyserver/xcaddy") (url "https://github.com/caddyserver/xcaddy")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "1452m1wksxmhy00rdkpnh55y8bxyxxcldapvp0fzpsyv82kfmsz1"))))
(base32 "1452m1wksxmhy00rdkpnh55y8bxyxxcldapvp0fzpsyv82kfmsz1"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
@ -134,9 +134,6 @@ Information and an optional icon.")
go-github-com-masterminds-semver-v3)) go-github-com-masterminds-semver-v3))
(home-page "https://github.com/caddyserver/xcaddy") (home-page "https://github.com/caddyserver/xcaddy")
(synopsis "- Custom Caddy Builder") (synopsis "- Custom Caddy Builder")
(description (description "This command line tool and associated Go package makes it easy to make custom
"This command line tool and associated Go package makes it easy to make custom
builds of the @@url{https://github.com/caddyserver/caddy,Caddy Web Server}.") builds of the @@url{https://github.com/caddyserver/caddy,Caddy Web Server}.")
(license license:asl2.0))) (license license:asl2.0)))
caddy-dirty-with-extensions

View file

@ -1,620 +0,0 @@
(define-module (glicid packages clam)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (gnu packages linux)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages storage)
#:use-module (gnu packages gcc)
#:use-module (glicid packages glicid)
#:use-module (guix build-system python)
#:use-module ((guix licenses)
#:prefix license:)
#:use-module (guix git-download)
#:use-module (gnu packages python)
#:use-module (guix build-system python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages check)
#:use-module (guix build-system copy)
#:use-module (gnu packages django)
#:use-module (gnu packages time)
#:use-module (gnu packages databases)
#:use-module (gnu packages python-build) ;setup-tools moved here.
)
;(define-public python-pytest-runner-4.5.1
; (package
; (name "python-pytest-runner")
; (version "4.5.1")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "pytest-runner" version))
; (sha256
; (base32
; "1vzilbayx5mznsdm1r258m3616374p6kvhsbj4j6238j9djkvjyi"))))
; (build-system python-build-system)
; (arguments
; '(;; FIXME: The test suite requires 'python-flake8' and 'python-black',
; ;; but that introduces a circular dependency.
; #:tests? #f
; #:phases (modify-phases %standard-phases
; (replace 'check
; (lambda* (#:key tests? #:allow-other-keys)
; (if tests?
; (invoke "pytest" "-vv")
; (format #t "test suite not run~%"))
; #t)))))
; (native-inputs
; `(("python-setuptools-scm" ,python-setuptools-scm)))
; (home-page "https://github.com/pytest-dev/pytest-runner")
; (synopsis "Invoke py.test as a distutils command")
; (description
; "This package provides a @command{pytest-runner} command that
;@file{setup.py} files can use to run tests.")
; (license license:expat)))
;
;(define-public python-keycloak-client-0.2.3
;(package
; (name "python-keycloak-client")
; (version "0.2.3")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "python-keycloak-client" version))
; (sha256
; (base32
; "0gw6wj1rlacfpgbp4b2wyp68ccrh713438qjpv11x6bnlcnf52x3"))))
; (build-system python-build-system) ;; FIXME: Tests require specific "pytest",
; ;; we don't have it for the moment.
; (arguments
; '(#:tests? #f))
;
;
; (propagated-inputs
; `(("python-jose" ,python-jose)
; ("python-pytest-runner-4.5.1", python-pytest-runner-4.5.1)
; ("python-requests" ,python-requests)))
; (native-inputs
; `(("python-bumpversion" ,python-bumpversion)
; ("python-pytest-runner-4.5.1", python-pytest-runner-4.5.1)
; ("python-twine" ,python-twine)))
; (home-page
; "https://github.com/Peter-Slump/python-keycloak-client")
; (synopsis "Install Python Keycloak client.")
; (description "Install Python Keycloak client.")
; (license license:expat))
;
;)
;
;
;(define-public glicid-django-keycloak
; (package
; (name "glicid-django-keycloak")
; (version "v0.1.2-bird")
; (source
; (origin
; (method git-fetch)
; (uri
; (git-reference
; (url "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/stages/2021/django-keycloak.git") (commit version)
; )
; )
;
; (file-name (git-file-name name version))
; (sha256
; (base32
; "0l380q6z504nndjl15cb5lkghpmm6f3rs4bgwy8sx5s12xz2sbck"
; )
; )
; )
; )
;
; (build-system python-build-system)
; ;; XXX: The git repository has no tags, and the PyPI releases do not
; ;; contain tests.
; (arguments '(#:tests? #f))
; (native-inputs `(("python-keycloak-client" , python-keycloak-client-0.2.3)
; ("python-ecdsa", python-ecdsa)
; ))
; (home-page "https://blabla")
; (synopsis "blabla")
; (description
; "This package provides a single-file minifier for CSS, HTML, and JavaScript.")
; ;; XXX: The README just says "GNU GPL and GNU LGPL and MIT". From
; ;; <https://github.com/juancarlospaco/css-html-js-minify/issues/9> it
; ;; looks like the user can choose a license.
; (license (list license:gpl3+ license:lgpl3+ license:expat))
;
; )
;)
;
;
;(define-public python-django-autocomplete-light
;(package
; (name "python-django-autocomplete-light")
; (version "3.8.2")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-autocomplete-light" version))
; (sha256
; (base32
; "145snirk0a7bgcgwisn5fzmb0w4m88zf6r55m2biz3wsnmqymw15"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; pb with django ?
; (native-inputs `(("python-django", python-django)))
; (propagated-inputs `(("python-six" ,python-six)))
; (home-page
; "http://django-autocomplete-light.rtfd.org")
; (synopsis "Fresh autocompletes for Django")
; (description "Fresh autocompletes for Django")
; (license license:expat))
;)
;
;(define-public python-django-icons
;
;(package
; (name "python-django-icons")
; (version "4.0.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-icons" version))
; (sha256
; (base32
; "06r0d68qknqa7p44nss6wzdcawakyr7ildgyl6mp5md9xb8klbah"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; django pb
; (propagated-inputs
; `(("python-django" ,python-django)
; ("python-importlib-metadata"
; ,python-importlib-metadata)))
; (home-page
; "https://github.com/zostera/django-icons")
; (synopsis "Icons for Django")
; (description "Icons for Django")
; (license #f))
;
;)
;
;(define-public python-django-admin-row-actions
;(package
; (name "python-django-admin-row-actions")
; (version "0.0.5")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-admin-row-actions" version))
; (sha256
; (base32
; "0rz71a54lj73wfi56flfh5m5fi7ah1cl8fph1h8y386s0am8plpz"))))
; (build-system python-build-system)
;
; (native-inputs `(("python-django", python-django)))
; (arguments '(#:tests? #f)) ; iteration problem
;
; (propagated-inputs `(("python-six" ,python-six)))
; (home-page
; "https://github.com/DjangoAdminHackers/django-admin-row-actions")
; (synopsis "django admin row actions")
; (description "django admin row actions")
; (license #f))
;)
;
;(define-public python-django-bootstrap4
;(package
; (name "python-django-bootstrap4")
; (version "3.0.1")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-bootstrap4" version))
; (sha256
; (base32
; "0azcalm95yh713fm1bmsqd73iz53fhmyajsg3fly6mmvffs7zjf5"))))
; (build-system python-build-system)
; (native-inputs `(("python-django", python-django)))
;(arguments '(#:tests? #f)) ; gdal not found.
; (propagated-inputs
; `(("python-beautifulsoup4" ,python-beautifulsoup4)
; ("python-django" ,python-django)
; ("python-importlib-metadata"
; ,python-importlib-metadata)))
; (home-page
; "https://github.com/zostera/django-bootstrap4")
; (synopsis "Bootstrap 4 for Django")
; (description "Bootstrap 4 for Django")
; (license #f))
;
;
;
;)
;
;(define-public python-django-mathfilters
;(package
; (name "python-django-mathfilters")
; (version "1.0.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-mathfilters" version))
; (sha256
; (base32
; "01sbnrznai6sz4w4qs7ld35039l7q5wh5zawwy1kd2gwdppr5f69"))))
; (build-system python-build-system)
; (native-inputs `(("python-django", python-django)))
;; (arguments '(#:tests? #f)) ; iteration problem
; (home-page
; "https://github.com/dbrgn/django-mathfilters")
; (synopsis
; "A set of simple math filters for Django")
; (description
; "A set of simple math filters for Django")
; (license license:expat))
;
;)
;
;(define-public python-tablib
;(package
; (name "python-tablib")
; (version "3.0.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "tablib" version))
; (sha256
; (base32
; "03f1z6jq6rf67gwhbm9ma4rydm8h447a5nh5lcs5l8jg8l4aqg7q"))))
; (build-system python-build-system)
;; (arguments '(#:tests? #f)) ; need setuptools ?
; (native-inputs `(("python-setuptools-scm", python-setuptools-scm)))
; (home-page "https://tablib.readthedocs.io")
; (synopsis
; "Format agnostic tabular data library (XLS, JSON, YAML, CSV)")
; (description
; "Format agnostic tabular data library (XLS, JSON, YAML, CSV)")
; (license license:expat))
;
;
;)
;
;(define-public python-markuppy
;
;(package
; (name "python-markuppy")
; (version "1.14")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "MarkupPy" version))
; (sha256
; (base32
; "0pqdmpxbr8iq22b4css2gz5z6s01ddpzyj25x27kgbs2lp0f5phs"))))
; (build-system python-build-system)
; (home-page
; "https://github.com/tylerbakke/MarkupPy")
; (synopsis "An HTML/XML generator")
; (description "An HTML/XML generator")
; (license license:expat))
;
;
;)
;
;(define-public python-xlwt
;(package
; (name "python-xlwt")
; (version "1.3.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "xlwt" version))
; (sha256
; (base32
; "123c2pdamshkq75wwvck8fq0cjq1843xd3x9qaiz2a4vg9qi56f5"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; code error
; (home-page "http://www.python-excel.org/")
; (synopsis "Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files, on any platform, with Python 2.6, 2.7, 3.3+")
; (description "Library to create spreadsheet files compatible with MS Excel 97/2000/XP/2003 XLS files, on any platform, with Python 2.6, 2.7, 3.3+")
; (license license:bsd-3))
;
;)
;
;(define-public python-django-import-export
;(package
; (name "python-django-import-export")
; (version "2.5.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-import-export" version))
; (sha256
; (base32
; "0j0gsj18bkkmbn262qj2syla80vncvqn49bllwxvcgw0zhxh1763"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; django error
; (native-inputs `(("python-markuppy", python-markuppy)
; ("python-odfpy",python-odfpy)
; ("python-xlwt",python-xlwt)
; ("python-xlrd",python-xlrd)
; ("python-pyyaml",python-pyyaml)
; ("python-openpyxl",python-openpyxl)
; ))
; (propagated-inputs
; `(("python-diff-match-patch"
; ,python-diff-match-patch)
; ("python-django" ,python-django)
; ("python-tablib" ,python-tablib)
; ))
; (home-page
; "https://github.com/django-import-export/django-import-export")
; (synopsis
; "Django application and library for importing and exporting data with included admin integration.")
; (description
; "Django application and library for importing and exporting data with included admin integration.")
; (license license:bsd-3))
;
;
;)
;
;(define-public python-django-timezone-field
;(package
; (name "python-django-timezone-field")
; (version "4.1.2")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-timezone-field" version))
; (sha256
; (base32
; "1pxrs6mkayr2rqxj8q4wdfrdhw1dnzvwkacajdjy6q6ha8jcdyng"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; needs rest-framework ?
; (propagated-inputs
; `(("python-django" ,python-django)
; ("python-pytz" ,python-pytz)))
; (home-page
; "http://github.com/mfogel/django-timezone-field/")
; (synopsis
; "A Django app providing database and form fields for pytz timezone objects.")
; (description
; "A Django app providing database and form fields for pytz timezone objects.")
; (license license:bsd-3))
;
;
;)
;
;
;(define-public python-crontab
;(package
; (name "python-crontab")
; (version "2.5.1")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "python-crontab" version))
; (sha256
; (base32
; "0cccrqc10r8781ba81x8r2frs3pl2m4hkm599k5358ak0xr7xgjb"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; AssertionError: 2 != 0 : Windows shell command not found!
;
; (propagated-inputs
; `(("python-dateutil" ,python-dateutil)))
; (home-page
; "https://gitlab.com/doctormo/python-crontab/")
; (synopsis "Python Crontab API")
; (description "Python Crontab API")
; (license #f))
;
;
;)
;
;(define-public python-click-repl
;
;(package
; (name "python-click-repl")
; (version "0.1.6")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "click-repl" version))
; (sha256
; (base32
; "1mcmz95595nrp4r58spy1ac993db26hk4q97isghbmn4md99vwmr"))))
; (build-system python-build-system)
; (propagated-inputs
; `(("python-click" ,python-click)
; ("python-prompt-toolkit" ,python-prompt-toolkit)
; ("python-six" ,python-six)))
; (home-page
; "https://github.com/untitaker/click-repl")
; (synopsis "REPL plugin for Click")
; (description "REPL plugin for Click")
; (license license:expat))
;)
;
;
;(define-public python-click-didyoumean
;
;(package
; (name "python-click-didyoumean")
; (version "0.0.3")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "click-didyoumean" version))
; (sha256
; (base32
; "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi"))))
; (build-system python-build-system)
; (propagated-inputs
; `(("python-click" ,python-click)))
; (home-page
; "https://github.com/timofurrer/click-didyoumean")
; (synopsis
; "Enable git-like did-you-mean feature in click.")
; (description
; "Enable git-like did-you-mean feature in click.")
; (license #f))
;
;)
;
;(define-public python-pytest-celery
;
;(package
; (name "python-pytest-celery")
; (version "0.0.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "pytest-celery" version))
; (sha256
; (base32
; "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g"))))
; (build-system python-build-system)
; (propagated-inputs
; `(("python-celery" ,python-celery-5.1.0)))
; (home-page
; "https://github.com/graingert/pytest-celery")
; (synopsis
; "pytest-celery a shim pytest plugin to enable celery.contrib.pytest")
; (description
; "pytest-celery a shim pytest plugin to enable celery.contrib.pytest")
; (license license:bsd-3))
;
;)
;
;(define-public python-celery-5.1.0
;
;(package
; (name "python-celery")
; (version "5.1.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "celery" version))
; (sha256
; (base32
; "110ix1h9axnc5dwzyswi1cvypzbr38p1jb1msyf1ikvq8p063w35"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; circular depedency
; (propagated-inputs
; `(("python-billiard" ,python-billiard)
; ("python-click" ,python-click)
; ("python-click-didyoumean"
; ,python-click-didyoumean)
; ("python-click-plugins" ,python-click-plugins)
; ("python-click-repl" ,python-click-repl)
; ("python-kombu" ,python-kombu)
; ("python-pytz" ,python-pytz)
; ("python-setuptools" ,python-setuptools)
; ("python-vine" ,python-vine)))
; ; (native-inputs
; ; `(("python-pytest-celery" ,python-pytest-celery))) ;; circular depedency !!
; (home-page "http://celeryproject.org")
; (synopsis "Distributed Task Queue.")
; (description "Distributed Task Queue.")
; (license license:bsd-3))
;
;)
;
;(define-public python-django-celery-beat
;
;(package
; (name "python-django-celery-beat")
; (version "2.2.0")
; (source
; (origin
; (method url-fetch)
; (uri (pypi-uri "django-celery-beat" version))
; (sha256
; (base32
; "0hx5ig1g0naagkmh39xbb64hhckd3b3pm12g9z03zig72pxkm8dq"))))
; (build-system python-build-system)
; (arguments '(#:tests? #f)) ; needs much more up to date python-vine
;
; ; (native-inputs `(("python-vine", python-vine)))
; (propagated-inputs
; `(("python-celery" ,python-celery-5.1.0)
; ("python-crontab" ,python-crontab)
; ("python-django" ,python-django)
; ("python-django-timezone-field"
; ,python-django-timezone-field)))
; (home-page
; "https://github.com/celery/django-celery-beat")
; (synopsis "Database-backed Periodic Tasks.")
; (description "Database-backed Periodic Tasks.")
; (license license:bsd-3))
;
;)
;
;(define-public glicid-clam
; (package
; (name "glicid-clam")
; (version "v0.0.1")
; (source
; (origin
; (method git-fetch)
; (uri
; (git-reference
; (url "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/stages/2021/cluster_account_manager.git") (commit version)
; )
; )
;
; (file-name (git-file-name name version))
; (sha256
; (base32
; "1x8q8wfl3p430dw8cawvfw4a4jjqw80gdg6zm90wmiad1f1lgd6r"
; )
; )
; )
; )
;; (build-system python-build-system)
; (build-system copy-build-system)
; ;; XXX: The git repository has no tags, and the PyPI releases do not
; ;; contain tests.
; (arguments '(
;
;;#:tests? #f
;; #:use-setuptools? #f ; uses custom distutils 'install' command
; #:phases
; (modify-phases %standard-phases
; (add-before 'reset-gzip-timestamps 'make-files-writable
; (lambda* (#:key outputs #:allow-other-keys)
; (let ((out (assoc-ref outputs "out")))
; (for-each make-file-writable
; (find-files out "\\.gz$"))
; #t))))))
;; )
;; )
; (propagated-inputs `(("python-keycloak-client" , python-keycloak-client-0.2.3)
; ("python-ecdsa", python-ecdsa)
; ("python-django", python-django)
; ("python-celery", python-celery-5.1.0)
; ("python-django-auth-ldap",python-django-auth-ldap)
; ("python-django-autocomplete-light",python-django-autocomplete-light)
; ("python-django-admin-row-actions", python-django-admin-row-actions)
; ("python-django-bootstrap4",python-django-bootstrap4)
; ("python-django-icons",python-django-icons)
; ("python-django-mathfilters",python-django-mathfilters)
; ("python-django-import-export",python-django-import-export)
; ("python-django-celery-beat",python-django-celery-beat)
; ("python-psycopg2",python-psycopg2)
; ("python-magic",python-magic)
;
; ))
; (home-page "https://blabla")
; (synopsis "blabla")
; (description
; "This package provides a single-file minifier for CSS, HTML, and JavaScript.")
; ;; XXX: The README just says "GNU GPL and GNU LGPL and MIT". From
; ;; <https://github.com/juancarlospaco/css-html-js-minify/issues/9> it
; ;; looks like the user can choose a license.
; (license (list license:gpl3+ license:lgpl3+ license:expat))
;
; )
;)

View file

@ -13,12 +13,8 @@
(version "2.2.8") (version "2.2.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz"))
"http://www.keepalived.org/software/keepalived-" version (sha256 (base32 "1dhvg9x976k4nnygxyv2gr55jfd88459kgiiqva9bwvl56v2x245"))))))
".tar.gz"))
(sha256
(base32
"1dhvg9x976k4nnygxyv2gr55jfd88459kgiiqva9bwvl56v2x245"))))))
(define-public keepalived-upstream-2.3.1 (define-public keepalived-upstream-2.3.1
@ -28,12 +24,8 @@
(version "2.3.1") (version "2.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz"))
"http://www.keepalived.org/software/keepalived-" version (sha256 (base32 "18raqq15xxf5hlrqhk39prq9xdfiv9px2nlrs43273lrzndvdx4j"))))))
".tar.gz"))
(sha256
(base32
"18raqq15xxf5hlrqhk39prq9xdfiv9px2nlrs43273lrzndvdx4j"))))))
(define local:keepalived (define local:keepalived

View file

@ -37,5 +37,4 @@
(substitute* "Makefile" (("install: install.bin install.remote install.man install.systemd") "install: install.bin install.remote install.systemd")))))) (substitute* "Makefile" (("install: install.bin install.remote install.man install.systemd") "install: install.bin install.remote install.systemd"))))))
(inputs `(("fuse-overlayfs" ,fuse-overlayfs) ,@(package-inputs gnu:podman))) (inputs `(("fuse-overlayfs" ,fuse-overlayfs) ,@(package-inputs gnu:podman)))
(native-inputs (list bats git go-1.20 pkg-config python)) (native-inputs (list bats git go-1.20 pkg-config python))
(propagated-inputs (list fuse-overlayfs gnu:slirp4netns iptables)) (propagated-inputs (list fuse-overlayfs gnu:slirp4netns iptables))))
))

View file

@ -1,32 +1,20 @@
(define-module (glicid packages cpp)) (define-module (glicid packages cpp)
#:use-module (guix packages)
(use-modules (guix packages) (gnu packages cpp)) #:use-module (gnu packages cpp)
)
(define-public reproc-with-cpp (define-public reproc-with-cpp
(package (package
(inherit reproc) (inherit reproc)
(name "reproc-with-cpp") (name "reproc-with-cpp")
(arguments (arguments
;; No tests.
`(#:tests? #f `(#:tests? #f
;; Build the shared library instead of a static one. #:configure-flags `("-DBUILD_SHARED_LIBS=1" "-DREPROC++=1")))))
#:configure-flags `("-DBUILD_SHARED_LIBS=1" "-DREPROC++=1")))
))
(define-public reproc-with-cpp-static (define-public reproc-with-cpp-static
(package (package
(inherit reproc) (inherit reproc)
(name "reproc-with-cpp-static") (name "reproc-with-cpp-static")
(arguments (arguments
;; No tests.
`(#:tests? #f `(#:tests? #f
;; Build the shared library instead of a static one. #:configure-flags `("-DREPROC++=1")))))
#:configure-flags `("-DREPROC++=1")))
))

View file

@ -1,5 +1,4 @@
(define-module (glicid packages crates-imported) (define-module (glicid packages crates-imported)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system cargo) #:use-module (guix build-system cargo)

View file

@ -7,7 +7,7 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages fonts) ; font-dejavu #:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -39,8 +39,6 @@
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -60,11 +58,8 @@
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gimp-print/" name "-" (uri (string-append "mirror://sourceforge/gimp-print/" name "-" (version-major+minor version) "/" version "/" name "-" version ".tar.xz"))
(version-major+minor version) "/" version "/" (sha256 (base32 "0fq2y9sx37d342fihp1ys9kf4sr2j5nc1kl33j9sirmqs80sfi6v"))))
name "-" version ".tar.xz"))
(sha256
(base32 "0fq2y9sx37d342fihp1ys9kf4sr2j5nc1kl33j9sirmqs80sfi6v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "check-parallel" `(#:test-target "check-parallel"
@ -74,8 +69,7 @@
"--enable-cups-1_2-enhancements") "--enable-cups-1_2-enhancements")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'check) ; works, but takes ages ! (delete 'check)
(add-before 'configure 'fix-paths (add-before 'configure 'fix-paths
(lambda* (#:key outputs native-inputs #:allow-other-keys) (lambda* (#:key outputs native-inputs #:allow-other-keys)
(substitute* "Makefile.in" (substitute* "Makefile.in"

View file

@ -29,7 +29,6 @@
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
,@(package-inputs gnu:postgresql-15))))) ,@(package-inputs gnu:postgresql-15)))))
; not yet public as the checks fails on jsonb_jsonpath
(define postgresql-17 (define postgresql-17
(package (package
(inherit postgresql-16) (inherit postgresql-16)

View file

@ -36,8 +36,7 @@
(arguments (arguments
`( `(
#:configure-flags #:configure-flags
(list "--with-sysroot=/" (list "--with-sysroot=/" (string-append "--with-pkcs11=" (assoc-ref %build-inputs "p11-kit")))
(string-append "--with-pkcs11=" (assoc-ref %build-inputs "p11-kit")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'strip 'move-to-utils (add-after 'strip 'move-to-utils

View file

@ -1,11 +0,0 @@
(define-module (glicid packages fabric-management)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module ((gnu packages fabric-management)
#:prefix gnu:)
#:use-module (glicid packages linux)
#:use-module (glicid utils)
)
;; obsolete packages deleted

View file

@ -1,6 +1,5 @@
(define-module (glicid packages file-systems) (define-module (glicid packages file-systems)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -18,7 +17,6 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
) )
(define-public autofs-glicid (define-public autofs-glicid
@ -27,33 +25,17 @@
(version "5.1.8") (version "5.1.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/linux/daemons/autofs/" (uri (string-append "mirror://kernel.org/linux/daemons/autofs/" "v" (version-major version) "/" "autofs-" version ".tar.xz"))
"v" (sha256 (base32 "1zf0fgf6kr9amxq5amlgsp1v13sizwl3wvx2xl7b4r2nhmci0gdk"))))
(version-major version)
"/"
"autofs-"
version
".tar.xz"))
(sha256
(base32
"1zf0fgf6kr9amxq5amlgsp1v13sizwl3wvx2xl7b4r2nhmci0gdk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list "--enable-ignore-busy" ;during shutdown `(#:configure-flags (list "--enable-ignore-busy"
"--enable-sloppy-mount" ;support mount(8) -s "--enable-sloppy-mount"
"--with-libtirpc" "--with-libtirpc"
(string-append "--with-openldap=" (string-append "--with-openldap=" (assoc-ref %build-inputs "openldap"))
(assoc-ref %build-inputs (string-append "--with-sasl=" (assoc-ref %build-inputs "cyrus-sasl"))
"openldap"))
(string-append "--with-sasl="
(assoc-ref %build-inputs
"cyrus-sasl"))
;; "HAVE_SSS_AUTOFS=1" ; required to make sssldir click
;; (string-append "sssldir="
;; (assoc-ref %build-inputs "sssd")
;; "/lib/sssd/modules")
) )
#:tests? #f ;no test suite #:tests? #f
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'fix-hard-coded-search-path (add-before 'configure 'fix-hard-coded-search-path
(lambda _ (lambda _
@ -67,24 +49,20 @@
(("^AUTOFS_LIB_LINK.*=" match) (("^AUTOFS_LIB_LINK.*=" match)
(string-append match " -Wl,-rpath=" out "/lib")))))) (string-append match " -Wl,-rpath=" out "/lib"))))))
(add-before 'install 'omit-obsolete-lookup_nis.so-link (add-before 'install 'omit-obsolete-lookup_nis.so-link
;; Building lookup_yp.so depends on $(YPCLNT) but this doesn't,
;; leading to a make error. Since it's broken, comment it out.
(lambda _ (lambda _
(substitute* "modules/Makefile" (substitute* "modules/Makefile"
(("ln -fs lookup_yp.so" match) (("ln -fs lookup_yp.so" match)
(string-append "# " match)))))))) (string-append "# " match))))))))
(native-inputs (list bison flex pkg-config rpcsvc-proto)) (native-inputs (list bison flex pkg-config rpcsvc-proto))
(inputs (list cyrus-sasl (inputs (list cyrus-sasl
e2fsprogs ;for e[234]fsck e2fsprogs
libtirpc libtirpc
libxml2 ;needed for LDAP, SASL libxml2
mit-krb5 ;needed for LDAP, SASL mit-krb5
nfs-utils ;for mount.nfs nfs-utils
openldap openldap
openssl ;needed for SASL openssl
;; sssd util-linux))
util-linux)) ;for mount, umount
;; XXX A directory index is the closest thing this has to a home page.
(home-page "https://www.kernel.org/pub/linux/daemons/autofs/") (home-page "https://www.kernel.org/pub/linux/daemons/autofs/")
(synopsis "Kernel-based automounter for Linux") (synopsis "Kernel-based automounter for Linux")
(description (description
@ -93,7 +71,5 @@ module. It automatically mounts selected file systems when they are used and
unmounts them after a set period of inactivity. This provides unmounts them after a set period of inactivity. This provides
centrally-managed, consistent file names for users and applications, even in a centrally-managed, consistent file names for users and applications, even in a
large and/or frequently changing (network) environment.") large and/or frequently changing (network) environment.")
;; fedfs/ is GPL-2-only but not built. (license (list license:bsd-3
(license (list license:bsd-3 ;modules/cyrus-sasl.c
license:gpl2+)))) license:gpl2+))))
; the rest

View file

@ -1,25 +1,20 @@
(define-module (glicid packages gcc) (define-module (glicid packages gcc)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages commencement) ; for make-gcc-toolchain #:use-module (gnu packages commencement)
#:use-module (gnu packages gcc) ; for gcc-11 #:use-module (gnu packages gcc)
) )
;; beware : access to internal functions… this is probably not the right way to do it …
(define custom-gcc (define custom-gcc
(@@ (gnu packages gcc) custom-gcc)) (@@ (gnu packages gcc) custom-gcc))
(define %generic-search-paths (define %generic-search-paths
(@@ (gnu packages gcc) %generic-search-paths)) (@@ (gnu packages gcc) %generic-search-paths))
;; now define-public normally hiden versions
(define-public gfortran-12 (define-public gfortran-12
(hidden-package (custom-gcc gcc-12 "gfortran" (hidden-package (custom-gcc gcc-12 "gfortran" '("fortran") %generic-search-paths)))
'("fortran") %generic-search-paths)))
(define make-gcc-toolchain (define make-gcc-toolchain
(@@ (gnu packages commencement) make-gcc-toolchain )) ; discouraged, find better alternative (@@ (gnu packages commencement) make-gcc-toolchain ))
(define-public gfortran-toolchain-12 (define-public gfortran-toolchain-12
(package (package
@ -30,12 +25,9 @@
fortran lang development to be installed in user profiles. This includes fortran lang development to be installed in user profiles. This includes
fortran, as well as libc (headers and binaries, plus debugging symbols fortran, as well as libc (headers and binaries, plus debugging symbols
in the @code{debug} output), and binutils."))) in the @code{debug} output), and binutils.")))
(define-public gfortran-13 (define-public gfortran-13
(hidden-package (custom-gcc gcc-13 "gfortran" (hidden-package (custom-gcc gcc-13 "gfortran"
'("fortran") %generic-search-paths))) '("fortran") %generic-search-paths)))
(define-public gfortran-toolchain-13 (define-public gfortran-toolchain-13
(package (package
(inherit (make-gcc-toolchain gfortran-13)) (inherit (make-gcc-toolchain gfortran-13))
@ -45,13 +37,9 @@
fortran lang development to be installed in user profiles. This includes fortran lang development to be installed in user profiles. This includes
fortran, as well as libc (headers and binaries, plus debugging symbols fortran, as well as libc (headers and binaries, plus debugging symbols
in the @code{debug} output), and binutils."))) in the @code{debug} output), and binutils.")))
(define-public gfortran-14 (define-public gfortran-14
(hidden-package (custom-gcc gcc-14 "gfortran" (hidden-package (custom-gcc gcc-14 "gfortran"
'("fortran") %generic-search-paths))) '("fortran") %generic-search-paths)))
(define-public gfortran-toolchain-14 (define-public gfortran-toolchain-14
(package (package
(inherit (make-gcc-toolchain gfortran-14)) (inherit (make-gcc-toolchain gfortran-14))
@ -62,9 +50,6 @@
fortran, as well as libc (headers and binaries, plus debugging symbols fortran, as well as libc (headers and binaries, plus debugging symbols
in the @code{debug} output), and binutils."))) in the @code{debug} output), and binutils.")))
(define-public gfortran-11 (define-public gfortran-11
(hidden-package (custom-gcc gcc-11 "gfortran" (hidden-package (custom-gcc gcc-11 "gfortran"
'("fortran") %generic-search-paths))) '("fortran") %generic-search-paths)))
@ -79,23 +64,6 @@
fortran, as well as libc (headers and binaries, plus debugging symbols fortran, as well as libc (headers and binaries, plus debugging symbols
in the @code{debug} output), and binutils."))) in the @code{debug} output), and binutils.")))
;; gfortran@10 and gfortran-toolchain@10 are defaults
;(define-public gfortran-10
; (hidden-package (custom-gcc gcc-10 "gfortran"
; '("fortran") %generic-search-paths)))
;(define-public gfortran-toolchain-10
; (package
; (inherit (make-gcc-toolchain gfortran-10))
; (synopsis "Complete GCC tool chain for fortran lang development")
; (description
; "This package provides a complete GCC tool chain for
; fortran lang development to be installed in user profiles. This includes
; fortran, as well as libc (headers and binaries, plus debugging symbols
; in the @code{debug} output), and binutils.")))
(define-public gfortran-9 (define-public gfortran-9
(hidden-package (custom-gcc gcc-9 "gfortran" (hidden-package (custom-gcc gcc-9 "gfortran"
'("fortran") %generic-search-paths))) '("fortran") %generic-search-paths)))

View file

@ -2,104 +2,28 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
;; #:use-module (guix licenses) #:use-module (guix build-system gnu)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gcc)
#:use-module (gnu packages commencement)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:use-module (guix build-system ruby)
#:prefix license:)
#:use-module ((guix utils)
#:select (target-64bit?))
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages bison)
#:use-module (gnu packages freeipmi) #:use-module (gnu packages chemistry)
#:use-module (gnu packages linux) #:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc)
#:use-module (gnu packages image)
#:use-module (gnu packages messaging)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages networking)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages parallel) #:use-module (gnu packages ruby)
#:use-module (gnu packages storage)
#:use-module (gnu packages networking)
#:use-module (gnu packages gtk)
#:use-module (gnu packages python)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
#:use-module (gnu packages tcl)
#:use-module (gnu packages tls)
#:use-module (gnu packages commencement)
#:use-module (gnu packages gcc)
#:use-module (gnu packages chemistry)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (srfi srfi-1)
#:use-module (gnu packages mpi)
#:use-module (gnu packages sssd)
#:use-module (gnu packages fabric-management)
#:use-module (gnu packages benchmark)
#:use-module (gnu packages messaging)
#:use-module (gnu packages web)
#:use-module (gnu packages gnome)
#:use-module (gnu packages cluster)
#:use-module (gnu packages libevent)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages fontutils) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages flex)
#:use-module (gnu packages bison)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools)
#:use-module (gnu packages fontutils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages image)
#:use-module (gnu packages maths)
#:use-module (guix utils)
#:use-module (gnu packages cmake)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages boost)
#:use-module (gnu packages curl)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages xml)
#:use-module (gnu packages admin)
#:use-module (gnu packages assembly)
#:use-module (gnu packages authentication)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
#:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages disk)
#:use-module (gnu packages gperf)
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
;; #:use-module (gnu packages glicid)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages virtualization)
;; #:use-module (glicid packages storage)
#:use-module (glicid packages mpi)
#:use-module (glicid packages gcc)
) )
;;;;;;;;
(define-public glicid-librdkafka-09 (define-public glicid-librdkafka-09
(package (package
(inherit librdkafka) (inherit librdkafka)
@ -107,12 +31,8 @@
(version "0.9.2") (version "0.9.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz"))
"https://github.com/edenhill/librdkafka/archive/v" version (sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2"))))))
".tar.gz"))
(sha256
(base32
"0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2"))))))
(define-public glicid-x2go (define-public glicid-x2go
(package (package
@ -120,19 +40,12 @@
(version "4.1.0.3") (version "4.1.0.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz"))
"https://code.x2go.org/releases/source/x2goserver/x2goserver-" (sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"))))
version ".tar.gz"))
(sha256
(base32
"1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"))))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(inputs `(("perl" ,perl))) (inputs `(("perl" ,perl)))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "X2go") (synopsis "X2go")
(description "X2go") (description "X2go")
@ -144,13 +57,10 @@
(inherit gromacs) (inherit gromacs)
(name "glicid-gromacs-openmpi") (name "glicid-gromacs-openmpi")
(inputs `(("openmpi" ,openmpi) (inputs `(("openmpi" ,openmpi)
;; ("openssh", openssh) ;; only for tests... disabled now
,@(package-inputs gromacs))) ,@(package-inputs gromacs)))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DGMX_DEVELOPER_BUILD=on" ;Needed to run tests `(#:configure-flags (list "-DGMX_DEVELOPER_BUILD=on"
;; Unbundling
"-DGMX_USE_LMFIT=EXTERNAL" "-DGMX_USE_LMFIT=EXTERNAL"
"-DGMX_BUILD_OWN_FFTW=off" "-DGMX_BUILD_OWN_FFTW=off"
"-DGMX_EXTERNAL_BLAS=on" "-DGMX_EXTERNAL_BLAS=on"
@ -158,31 +68,19 @@
"-DGMX_EXTERNAL_TNG=on" "-DGMX_EXTERNAL_TNG=on"
"-DGMX_EXTERNAL_ZLIB=on" "-DGMX_EXTERNAL_ZLIB=on"
"-DGMX_EXTERNAL_TINYXML2=on" "-DGMX_EXTERNAL_TINYXML2=on"
;; special glicid
"-DGMX_MPI=on" "-DGMX_MPI=on"
"-DCMAKE_C_COMPILER=mpicc" "-DCMAKE_C_COMPILER=mpicc"
"-DCMAKE_CXX_COMPILER=mpicxx" "-DCMAKE_CXX_COMPILER=mpicxx"
"-DGMX_DOUBLE=off" "-DGMX_DOUBLE=off"
"-DGMX_OPENMP=on" "-DGMX_OPENMP=on"
"-DGMX_SIMD=AVX2_256" "-DGMX_SIMD=AVX2_256"
(string-append "-DTinyXML2_DIR=" (string-append "-DTinyXML2_DIR=" (assoc-ref %build-inputs "tinyxml2"))
(assoc-ref %build-inputs
"tinyxml2"))
;; Workaround for cmake/FindSphinx.cmake version parsing that does
;; not understand the guix-wrapped `sphinx-build --version' answer
(string-append "-DSPHINX_EXECUTABLE_VERSION=" (string-append "-DSPHINX_EXECUTABLE_VERSION="
,(package-version python-sphinx))) ,(package-version python-sphinx)))
#:tests? #f #:tests? #f
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'fixes (add-after 'unpack 'fixes
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Still bundled: part of gromacs, source behind registration
;; but free software anyways
;; (delete-file-recursively "src/external/vmd_molfile")
;; Still bundled: threads-based OpenMPI-compatible fallback
;; designed to be bundled like that
;; (delete-file-recursively "src/external/thread_mpi")
;; Unbundling
(delete-file-recursively "src/external/lmfit") (delete-file-recursively "src/external/lmfit")
(delete-file-recursively "src/external/clFFT") (delete-file-recursively "src/external/clFFT")
(delete-file-recursively "src/external/fftpack") (delete-file-recursively "src/external/fftpack")
@ -190,17 +88,11 @@
(delete-file-recursively "src/external/tng_io") (delete-file-recursively "src/external/tng_io")
(delete-file-recursively "src/external/tinyxml2") (delete-file-recursively "src/external/tinyxml2")
(delete-file-recursively "src/external/googletest") (delete-file-recursively "src/external/googletest")
(copy-recursively (assoc-ref inputs "googletest-source") (copy-recursively (assoc-ref inputs "googletest-source") "src/external/googletest")
"src/external/googletest")
;; This test warns about the build host hardware, disable
(substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp"
(("TEST\\(HardwareTopologyTest, HwlocExecute\\)") (("TEST\\(HardwareTopologyTest, HwlocExecute\\)")
"void __guix_disabled()")) "void __guix_disabled()"))
#t))))) #t)))))))
)
)
(define-public glicid-python-nbxmpp (define-public glicid-python-nbxmpp
(package (package
@ -210,23 +102,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "nbxmpp" version)) (uri (pypi-uri "nbxmpp" version))
(sha256 (sha256 (base32 "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr")))) ))
(base32
"0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
))
; no more useful
;(define-public glicid-specific-hdf5
; (package
; (inherit hdf5-1.12)
; (name "glicid-specific-hdf5")
; ;; (arguments
; ;; `(#:tests? #f)
; ;; )
; (native-inputs `(("gcc" ,gcc-11)
; ("gfortran" ,gfortran-11)
; ,@(package-native-inputs hdf5-1.12)))))
(define-public glicid-motif (define-public glicid-motif
(package (package
@ -234,29 +110,15 @@
(version "2.3.8") (version "2.3.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; (uri (string-append "https://sourceforge.net/projects/motif/files/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz/download")) (uri (string-append "mirror://sourceforge/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz"))
;; (uri (string-append "mirror://sourceforge/motif/files/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz"))
(uri (string-append
"mirror://sourceforge/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (base32 "1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5"))))
(sha256
(base32
"1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
;; #:make-flags
(list (string-append "PREFIX=" %output) (list (string-append "PREFIX=" %output)
;; (string-append "CC=" ,(cc-for-target)) (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "freetype") "/include/freetype2")
;; Xft.h #includes <ft2build.h> without freetype2/. The Makefile
;; works around this by hard-coding /usr/include & $PREFIX.
(string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "freetype")
"/include/freetype2")
"V=1"))) "V=1")))
(inputs `(("libxext" ,libxext) (inputs `(("libxext" ,libxext)
("libx11" ,libx11) ("libx11" ,libx11)
("freetype" ,freetype) ("freetype" ,freetype)
@ -266,13 +128,10 @@
("flex" ,flex) ("flex" ,flex)
("bison" ,bison) ("bison" ,bison)
("libxt" ,libxt))) ("libxt" ,libxt)))
(synopsis "Motif") (synopsis "Motif")
(description "Motif ") (description "Motif ")
(home-page "https://sourceforge.net/untested") (home-page "https://sourceforge.net/untested")
(license license:gpl2+) ;probably not !!! (license license:gpl2+)))
))
(define-public glicid-xmgrace (define-public glicid-xmgrace
(package (package
@ -281,15 +140,11 @@
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url (url "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/grace.git")
"https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/grace.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256 (base32 "1wb8v0q8xa2akas0swpgdgw1s66i50k7kh1g2f894hnk91fzx56z"))))
(base32
"1wb8v0q8xa2akas0swpgdgw1s66i50k7kh1g2f894hnk91fzx56z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'configure 'patch-/bin/sh (add-after 'configure 'patch-/bin/sh
@ -297,7 +152,6 @@
(substitute* '("Make.conf") (substitute* '("Make.conf")
(("/bin/sh") (("/bin/sh")
(which "bash")))))))) (which "bash"))))))))
(inputs `(("libx11" ,libx11) (inputs `(("libx11" ,libx11)
("libxft" ,libxft) ("libxft" ,libxft)
("libxt" ,libxt) ("libxt" ,libxt)
@ -307,22 +161,11 @@
("glicid-motif" ,glicid-motif) ("glicid-motif" ,glicid-motif)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("gfortran" ,gfortran) ("gfortran" ,gfortran)
("libjpeg-turbo" ,libjpeg-turbo) ("libjpeg-turbo" ,libjpeg-turbo) ))
;; ("libxmhtml", libxmhtml)
))
(synopsis "Xmgrace") (synopsis "Xmgrace")
(description "xmgrace") (description "xmgrace")
(home-page "https://sourceforge.net/untested") (home-page "https://sourceforge.net/untested")
(license license:gpl2+) ; probably not (license license:gpl2+) ))
))
(use-modules (guix packages))
(use-modules (guix download))
(use-modules (gnu packages ruby))
(use-modules (guix build-system ruby))
;(use-modules (guix licenses))
(define-public ruby-asciidoctor-revealjs (define-public ruby-asciidoctor-revealjs
(package (package
@ -338,14 +181,11 @@
(arguments (arguments
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor) (propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor)
;; ("ruby-concurrent-ruby" ,ruby-concurrent-ruby)
("ruby-concurrent" ,ruby-concurrent) ("ruby-concurrent" ,ruby-concurrent)
("ruby-asciidoctor-kroki" ,ruby-asciidoctor-kroki) ("ruby-asciidoctor-kroki" ,ruby-asciidoctor-kroki)
("ruby-thread-safe" ,ruby-thread-safe))) ("ruby-thread-safe" ,ruby-thread-safe)))
(synopsis (synopsis "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.")
"Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") (description "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.")
(description
"Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.")
(home-page "https://github.com/asciidoctor/asciidoctor-reveal.js") (home-page "https://github.com/asciidoctor/asciidoctor-reveal.js")
(license license:expat))) (license license:expat)))
@ -356,20 +196,12 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "asciidoctor-kroki" version)) (uri (rubygems-uri "asciidoctor-kroki" version))
(sha256 (sha256 (base32 "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w"))))
(base32
"13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor))) (propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor)))
(synopsis (synopsis "An extension for Asciidoctor to convert diagrams to images using https://kroki.io")
"An extension for Asciidoctor to convert diagrams to images using https://kroki.io") (description "An extension for Asciidoctor to convert diagrams to images using https://kroki.io")
(description
"An extension for Asciidoctor to convert diagrams to images using https://kroki.io")
(home-page "https://github.com/Mogztter/asciidoctor-kroki") (home-page "https://github.com/Mogztter/asciidoctor-kroki")
(license license:expat))) (license license:expat)))
;; python-glances is now upstreamed as glances in python-xyz
;;; glicid.scm ends here

View file

@ -13,33 +13,3 @@
(name "glicid-terminator") (name "glicid-terminator")
(propagated-inputs `(("sssd" ,sssd) (propagated-inputs `(("sssd" ,sssd)
,@(package-propagated-inputs terminator))))) ,@(package-propagated-inputs terminator)))))
;; guix defined version is now on par or newer…
;(define-public network-manager-openconnect-upstream
; (package
; (inherit network-manager-openconnect)
; (name "network-manager-openconnect-upstream")
; (version "1.2.8")
;; (version "1.2.7")
; (source (origin
; (method url-fetch)
; (uri (string-append
; "mirror://gnome/sources/NetworkManager-openconnect/"
; (version-major+minor version)
; "/NetworkManager-openconnect-" version ".tar.xz"))
; (sha256
; (base32
; "1k6d6cv2c9v8gf0f2js6cklr3ijhaanbz0nhvlwy5n42bmwamvax"))))
; )
;)
;(define-public network-manager-openconnect-glicid
; (transform-package
; (
; (instead-of "openconnect" openconnect-upstream)
; network-manager-openconnect
; ) "glicid"
; )
;)

View file

@ -1,49 +0,0 @@
(define-module (glicid packages jupyter)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages check)
#:use-module (gnu packages python-xyz)
; #:use-module ((guix-science packages jupyter) #:prefix gs:)
)
;(define-public python-jupyterhub
; (package
; (inherit gs:python-jupyterhub)
; (name "python-jupyterhub")
; (version "4.0.0")
; (source (origin
; (method url-fetch)
; (uri (pypi-uri "jupyterhub" version))
; (sha256 (base32 "0rx82hmwi6m2c7q8mw8a7r45j8245schln5vq1q2nzcswjb2karc"))))))
;(define-public python-batchspawner
; (package
; (name "python-batchspawner")
; (version "1.2.0")
; (source (origin
; (method url-fetch)
; (uri (pypi-uri "batchspawner" version))
; (sha256 (base32 "089f18s79kb2983wy4vb3vcwynmw7pzxmv0jwfhjgxd3yfs4p4mi"))))
; (build-system python-build-system)
; (propagated-inputs (list python-async-generator python-jinja2 python-jupyterhub python-pytest))
; (home-page "http://jupyter.org")
; (synopsis "Batchspawner: A spawner for Jupyterhub to spawn notebooks using batch resource managers.")
; (description "Batchspawner: A spawner for Jupyterhub to spawn notebooks using batch resource managers.")
; (license license:bsd-3)))
;(define-public python-batchspawner-git
; (package
; (inherit python-batchspawner)
; (name "python-batchspawner")
; (version "d5f9a0b")
; (source
; (origin
; (method git-fetch)
; (uri (git-reference
; (url "https://github.com/jupyterhub/batchspawner")
; (commit version)))
; (sha256 (base32 "03z1ww5qlwjn3xs3lf9b78yrqq7kd6rd5bh2kn377md391hz09f7"))))))

View file

@ -1,26 +0,0 @@
(define-module (glicid packages linux)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (gnu packages)
#:use-module (gnu packages backup)
#:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup)
#:use-module (gnu packages golang)
#:use-module ((gnu packages linux) #:prefix gnu:)
#:use-module (gnu packages linux)
#:use-module (gnu system uuid)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
#:use-module (glicid packages golang)
#:use-module (glicid utils))
;; lots of obsolete packages deleted

View file

@ -10,8 +10,8 @@
(package (package
(inherit gnu:rsyslog) (inherit gnu:rsyslog)
(name "rsyslog") (name "rsyslog")
(version "8.2410.0") (version "8.2412.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.rsyslog.com/files/download/rsyslog/rsyslog-" version ".tar.gz"))) (uri (list (string-append "https://www.rsyslog.com/files/download/rsyslog/rsyslog-" version ".tar.gz")))
(sha256 (base32 "1fkff9wy1q1bq706cw65mvwaqgjgnwfc1hbj94qxwk6zcv3h7gmn")))))) (sha256 (base32 "00j82xs030mv2aas6i1f7dk4wxwbhk11r15issypd9fbfyhabpwc"))))))

View file

@ -1,121 +1,18 @@
(define-module (glicid packages maths) (define-module (glicid packages maths)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (glicid utils)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp)
#:use-module ((gnu packages maths) #:prefix gnu:) #:use-module ((gnu packages maths) #:prefix gnu:)
#:use-module (gnu packages commencement)
#:use-module (gnu packages mpi)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages commencement)
#:use-module (glicid utils) #:use-module (gnu packages compression)
#:use-module (ice-9 regex)
#:use-module (ice-9 match)
#:use-module (guix gexp)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix build-system ant)
#:use-module (guix build-system copy)
#:use-module (guix build-system dune)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system ocaml)
#:use-module (guix build-system perl)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system ruby)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages calendar)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages coq)
#:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages cpp)
#:use-module (gnu packages datamash)
#:use-module (gnu packages dbm)
#:use-module (gnu packages documentation)
#:use-module (gnu packages elf)
#:use-module (gnu packages emacs)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages groff)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages image-processing)
#:use-module (gnu packages java)
#:use-module (gnu packages less)
#:use-module (gnu packages lisp)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
#:use-module (gnu packages logging)
#:use-module (gnu packages lua)
#:use-module (gnu packages gnome)
#:use-module (gnu packages guile)
#:use-module (gnu packages xorg)
#:use-module (gnu packages gl)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages m4)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages multiprecision) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages ncurses) )
#:use-module (gnu packages netpbm)
#:use-module (gnu packages ocaml)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages parallel)
#:use-module (gnu packages pcre)
#:use-module (gnu packages popt)
#:use-module (gnu packages perl)
#:use-module (gnu packages prolog)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
#:use-module (gnu packages tbb)
#:use-module (gnu packages scheme)
#:use-module (gnu packages serialization)
#:use-module (gnu packages shells)
#:use-module (gnu packages simulation)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages swig)
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
(define-public scalapack-upstream (define-public scalapack-upstream
(package (package
(inherit gnu:scalapack) (inherit gnu:scalapack)
@ -128,20 +25,16 @@
"https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/scalapack.git") "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/scalapack.git")
(commit "myv2.0.2"))) (commit "myv2.0.2")))
(file-name "scalapack-univ-myv2") (file-name "scalapack-univ-myv2")
;; (patches (search-patches "scalapack-blacs-mpi-deprecations.patch")) (sha256 (base32 "1ccic46psf2hl9wsyflvkn5rxg8k17q578m9mzimvm9brbggf0na"))))
(sha256
(base32
"1ccic46psf2hl9wsyflvkn5rxg8k17q578m9mzimvm9brbggf0na"))))
(arguments (arguments
`(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES") `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'check 'mpi-setup (add-before 'check 'mpi-setup
,%openmpi-setup)))))) ,%openmpi-setup))))))
(define local:scalapack (define local:scalapack scalapack-upstream)
scalapack-upstream)
(define-public scalapack-latest (define-public scalapack-latest (latest-version local:scalapack gnu:scalapack))
(latest-version local:scalapack gnu:scalapack))
(define-public openblas-upstream-0.3.15 (define-public openblas-upstream-0.3.15
(package (package
@ -150,12 +43,8 @@
(version "0.3.15") (version "0.3.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz"))
"https://github.com/xianyi/OpenBLAS/releases/download/v" (sha256 (base32 "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))))))
version "/OpenBLAS-" version ".tar.gz"))
(sha256
(base32
"1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))))))
(define-public hdf5-glicid (define-public hdf5-glicid
@ -166,24 +55,8 @@
(prepend gfortran-toolchain))))) (prepend gfortran-toolchain)))))
(define local:openblas (define local:openblas openblas-upstream-0.3.15)
openblas-upstream-0.3.15) (define-public scalapack-latest (latest-version local:openblas gnu:openblas))
(define-public scalapack-latest
(latest-version local:openblas gnu:openblas))
(use-modules (guix packages))
(use-modules (guix download))
(use-modules (gnu packages linux))
(use-modules (gnu packages gcc))
(use-modules (gnu packages compression))
;(use-modules (gnu packages glicid))
(use-modules (guix git-download))
(use-modules (guix build-system cmake))
(use-modules ((guix licenses)
#:prefix license:))
(define-public libsolv-upstream (define-public libsolv-upstream
(package (package
@ -195,17 +68,13 @@
(url "https://github.com/openSUSE/libsolv.git") (url "https://github.com/openSUSE/libsolv.git")
(commit version))) (commit version)))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256 (base32 "12z63kcna9swh3vzxk3sac0l4by5z8q22wip9cyq5b7wp9m3hn4b"))))
(base32 "12z63kcna9swh3vzxk3sac0l4by5z8q22wip9cyq5b7wp9m3hn4b"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (list zlib)) (inputs (list zlib))
(home-page "https://github.com/openSUSE/libsolv") (home-page "https://github.com/openSUSE/libsolv")
(synopsis "libsolv, a free package dependency solver using a satisfiability algorithm.") (synopsis "libsolv, a free package dependency solver using a satisfiability algorithm.")
(description "libsolv, a free package dependency solver using a satisfiability algorithm.") (description "libsolv, a free package dependency solver using a satisfiability algorithm.")
(license license:bsd-3)) (license license:bsd-3)) )
)
(define-public glicid-dealii (define-public glicid-dealii
(package (package
@ -213,11 +82,7 @@
(version "9.6.0") (version "9.6.0")
(name "glicid-dealii") (name "glicid-dealii")
(arguments (arguments
(list #:build-type "Release" ; Only Debug, Release or DebugRelease. (list #:build-type "Release"
;; The tests take too long and must be explicitly enabled with
;; "make setup_tests".
;; See https://www.dealii.org/developer/developers/testsuite.html.
;; (They can also be run for an already installed deal.II.)
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags
#~(let ((doc (string-append #$output:doc "/share/doc/" #~(let ((doc (string-append #$output:doc "/share/doc/"
@ -226,43 +91,25 @@
(string-append "-DCMAKE_CXX_FLAGS='-march=znver3'") (string-append "-DCMAKE_CXX_FLAGS='-march=znver3'")
(string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) (string-append "-DDEAL_II_DOCREADME_RELDIR=" doc)
(string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") (string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html")
;; Don't compile the examples because the source and
;; CMakeLists.txt are installed anyway, allowing users to
;; do so for themselves.
"-DDEAL_II_COMPILE_EXAMPLES=OFF" "-DDEAL_II_COMPILE_EXAMPLES=OFF"
(string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc (string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc
"/examples"))) "/examples")))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; Without unsetting CPATH, the build fails with the following
;; error (similar to <https://bugs.gnu.org/30756>):
;;
;; /gnu/store/…-gcc-11.3.0/include/c++/math.h:30:16: fatal error: math.h: No such file or directory
;; 30 | # include_next <math.h>
;; | ^~~~~~~~
;;
;; Why does unsetting CPATH magically fix the error?
;; TODO: Properly fix this issue.
(add-after 'set-paths 'unset-cpath (add-after 'set-paths 'unset-cpath
(lambda _ (lambda _
(unsetenv "CPATH"))) (unsetenv "CPATH")))
(add-after 'install 'remove-build-logs (add-after 'install 'remove-build-logs
;; These build logs leak the name of the build directory by
;; storing the values of CMAKE_SOURCE_DIR and
;; CMAKE_BINARY_DIR.
(lambda _ (lambda _
(let ((doc (string-append #$output:doc "/share/doc/" (let ((doc (string-append #$output:doc "/share/doc/"
#$name "-" #$version))) #$name "-" #$version)))
(for-each delete-file (for-each delete-file
(map (lambda (f) (string-append doc "/" f)) (map (lambda (f) (string-append doc "/" f))
'("detailed.log" "summary.log"))))))))) '("detailed.log" "summary.log"))))))))) ))
))
(define trilinos-for-dealii-openmpi (define trilinos-for-dealii-openmpi
(@@ (gnu packages maths) trilinos-for-dealii-openmpi)) (@@ (gnu packages maths) trilinos-for-dealii-openmpi))
(define-public glicid-dealii-openmpi (define-public glicid-dealii-openmpi
(package (package
(inherit glicid-dealii) (inherit glicid-dealii)
@ -289,8 +136,5 @@
#~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)) #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags))
((#:phases phases #~%standard-phases) ((#:phases phases #~%standard-phases)
#~(modify-phases #$phases #~(modify-phases #$phases
;; The build failure fixed by this phase does not manifest when
;; Kokkos is included via Trilinos.
(delete 'unset-cpath))))) (delete 'unset-cpath)))))
(synopsis "Finite element library (with MPI support)"))) (synopsis "Finite element library (with MPI support)")))

View file

@ -17,8 +17,6 @@
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 %zabbix-hash)) (sha256 (base32 %zabbix-hash))
;; YD upstream now able to cope with 2.17 timescaledb
;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
@ -34,8 +32,6 @@
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 %zabbix-hash)) (sha256 (base32 %zabbix-hash))
;; YD upstream now able to cope with 2.17 timescaledb
;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")
@ -51,8 +47,6 @@
(method url-fetch) (method url-fetch)
(uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (uri (string-append "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz"))
(sha256 (base32 %zabbix-hash)) (sha256 (base32 %zabbix-hash))
;; YD upstream now able to cope with 2.17 timescaledb
;; (patches (search-patches "glicid/packages/patches/glicid-zabbix-timescaledb-2.17.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c") '(substitute* '("src/zabbix_proxy/proxy.c" "src/zabbix_server/server.c")

View file

@ -3,15 +3,12 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module ((gnu packages mpi) #:use-module ((gnu packages mpi)
#:prefix gnu:) #:prefix gnu:)
#:use-module (glicid packages linux)
#:use-module (glicid packages fabric-management)
#:use-module (glicid utils) #:use-module (glicid utils)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (glicid packages parallel) #:use-module (glicid packages parallel)
#:use-module (gnu packages)) #:use-module (gnu packages))
(define-public openmpi-glicid (define-public openmpi-glicid
(package (package
(inherit gnu:openmpi-4) (inherit gnu:openmpi-4)
(name "openmpi-glicid") (name "openmpi-glicid")

View file

@ -1,5 +1,7 @@
(define-module (glicid packages networking) (define-module (glicid packages networking)
#:use-module ((gnu packages networking) #:prefix gnu:) #:use-module ((gnu packages networking) #:prefix gnu:)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
@ -25,12 +27,16 @@
(package (package
(inherit gnu:squid) (inherit gnu:squid)
(name "squid") (name "squid")
(version "6.12") (version "6.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.squid-cache.org/Versions/v6/squid-" version ".tar.xz")) (uri (string-append "https://github.com/squid-cache/squid/archive/refs/tags/SQUID_6_13.tar.gz"))
(sha256 (base32 "0l6bng9irigrcy5q9lalynwpc3czk9lx9994dwk179834sxkmpzk")))) (sha256 (base32 "057g3grvf2fx7v3njq3rc77j2wbqmx458vfkdgin4vraxbvf5a43"))))
(inputs `(("libecap" ,libecap) (inputs `(("libecap" ,libecap)
("automake" ,automake)
("autoconf" ,autoconf)
("libtool" ,libtool)
("which" ,which)
,@(package-inputs gnu:squid))) ,@(package-inputs gnu:squid)))
(arguments (arguments
'(#:configure-flags (list "--disable-arch-native" '(#:configure-flags (list "--disable-arch-native"

View file

@ -33,15 +33,11 @@
(url "https://github.com/nfs-ganesha/nfs-ganesha.git") (url "https://github.com/nfs-ganesha/nfs-ganesha.git")
(commit (string-append "V" version)) (commit (string-append "V" version))
(recursive? #t))) (recursive? #t)))
(sha256 (sha256 (base32 "0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4"))
(base32
"0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "-DLIB_INSTALL_DIR=" `(#:configure-flags (list (string-append "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib"))
(assoc-ref %outputs "out")
"/lib"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (lambda _

View file

@ -31,7 +31,7 @@
(uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz")))
(sha256 (base32 "184ywcpw9gbrllp1a1q9a6g7aq583phxnhj4cd1lv622yn69jbh8")))) (sha256 (base32 "184ywcpw9gbrllp1a1q9a6g7aq583phxnhj4cd1lv622yn69jbh8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list argon2 cyrus-sasl openssl libevent libxcrypt libltdl lz4 perl snappy unixodbc wiredtiger zlib)) ;; YD : was libgcrypt ?? but broken (Sept 2024) (inputs (list argon2 cyrus-sasl openssl libevent libxcrypt libltdl lz4 perl snappy unixodbc wiredtiger zlib))
(native-inputs (list bdb groff libtool pkg-config)) (native-inputs (list bdb groff libtool pkg-config))
(arguments `( (arguments `(
#:tests? #f #:tests? #f
@ -69,9 +69,7 @@
(sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6")))) (sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "--with-pam-seclib-dir=" `(#:configure-flags (list (string-append "--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/")
(assoc-ref %outputs "out")
"/lib/security/")
"--with-ldap-conf-file=/etc/nslcd.conf") "--with-ldap-conf-file=/etc/nslcd.conf")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'override-nslcd.conf-install-path (add-after 'unpack 'override-nslcd.conf-install-path

View file

@ -4,10 +4,8 @@
#: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)
#:prefix gnu:)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -17,16 +15,13 @@
#:use-module (gnu packages haskell-xyz) #:use-module (gnu packages haskell-xyz)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (glicid utils) #:use-module (glicid utils)
; #:use-module (glicid packages fabric-management) ;for latest ucx
#:use-module (gnu packages fabric-management) #:use-module (gnu packages fabric-management)
#:use-module (glicid packages containers) ;for latest podman #:use-module (glicid packages containers)
#:use-module (gnu packages compression) ;lz4 #:use-module (gnu packages compression)
#:use-module (gnu packages lua) ;lua #:use-module (gnu packages lua)
#:use-module (gnu packages web) ;json-c, http-parser for slurm REST API #:use-module (gnu packages web)
#:use-module (gnu packages serialization) ;libyaml for slurm REST API #:use-module (gnu packages serialization)
#:use-module ((guix utils) #:use-module ((guix utils) #:select (target-64bit?))
#:select (target-64bit?))
) )
@ -36,16 +31,13 @@
(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"
version "/pmix-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv")))) "13cc11wxf00w485h6pxjcpwziihaix1pj9rrd20cis1i4bi2hrfv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list (string-append "--with-hwloc=" `(#:configure-flags (list (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")))))
(assoc-ref %build-inputs "hwloc")))))
(synopsis "MPIX lib") (synopsis "MPIX lib")
(description "MPIX. More to come. FIXIT") (description "MPIX. More to come. FIXIT")
(home-page "https://www.gnu.org/software/hello/") (home-page "https://www.gnu.org/software/hello/")
@ -53,15 +45,9 @@
(inputs (list libevent (inputs (list libevent
`(,hwloc-2 "lib") perl)))) `(,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)
@ -70,13 +56,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 "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
@ -86,10 +69,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
@ -99,10 +80,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 "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr"))))))
(sha256
(base32 "0gf7x85bzpkrx87mb16wyiyvkjxqq01sbajsjxwrspyi2v675hgr"))))))
(define-public slurm-upstream-24.05 (define-public slurm-upstream-24.05
(package (package
@ -112,10 +91,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 "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl"))))))
(sha256
(base32 "0vxiymp40lgcb1z76cyqdpqpy7w14r483v54dk4aq84v0aw0mixl"))))))
(define-public slurm-upstream-24.11 (define-public slurm-upstream-24.11
(package (package
@ -125,96 +102,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 "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
@ -225,32 +114,15 @@
#: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"))
;; (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?) #$@(if (target-64bit?)
'() '()
'("--enable-deprecated"))) '("--enable-deprecated")))
@ -262,29 +134,25 @@
"_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")
;; Others expect pmi2.
(invoke "make" "install" "-C" "contribs/pmi2")))))) (invoke "make" "install" "-C" "contribs/pmi2"))))))
(inputs (modify-inputs (package-inputs base-package) (inputs (modify-inputs (package-inputs base-package)
(prepend gtk+-2 ;for sview (prepend gtk+-2
ucx gnu:openpmix ;for pmix support ucx gnu:openpmix
json-c json-c
libjwt libjwt
libyaml libyaml
http-parser ;for REST API http-parser
`(,mariadb "dev")))))) ; for mariadb/mysql client support `(,mariadb "dev"))))))
(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)

View file

@ -19,24 +19,17 @@
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/Syllo/nvtop/archive/refs/tags/" version ".tar.gz")) (uri (string-append "https://github.com/Syllo/nvtop/archive/refs/tags/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256 (base32 "005f9dsaf3w0nck1r0h9mznv4svav8bc4l28f0h57zkmssi4byk3"))))
(base32
"005f9dsaf3w0nck1r0h9mznv4svav8bc4l28f0h57zkmssi4byk3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; No tests available `(#:tests? #f ; No tests available
#:configure-flags '("-DNVIDIA_SUPPORT=ON" "-DINTEL_SUPPORT=ON" "-DAMDGPU_SUPPORT=ON" "-DMSM_SUPPORT=ON") #:configure-flags '("-DNVIDIA_SUPPORT=ON" "-DINTEL_SUPPORT=ON" "-DAMDGPU_SUPPORT=ON" "-DMSM_SUPPORT=ON")))
)
)
(inputs (inputs
`(("ncurses" ,ncurses) `(("ncurses" ,ncurses)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("eudev" ,eudev) ("eudev" ,eudev)
("libdrm" , libdrm) ("libdrm" , libdrm)))
))
(home-page "https://github.com/Syllo/nvtop") (home-page "https://github.com/Syllo/nvtop")
(synopsis "NVIDIA GPUs htop like monitoring tool") (synopsis "NVIDIA GPUs htop like monitoring tool")
(description "Nvtop is a htop-like monitoring tool for NVIDIA GPUs. It can show a quick overview of the GPU usage and the list of processes using the GPU.") (description "Nvtop is a htop-like monitoring tool for NVIDIA GPUs. It can show a quick overview of the GPU usage and the list of processes using the GPU.")
(license license:expat) (license license:expat))
)

View file

@ -10,12 +10,8 @@
(version "1.14") (version "1.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "mirror://cpan/authors/id/D/DO/DOUGM/ExtUtils-Embed-" version ".tar.gz"))
"mirror://cpan/authors/id/D/DO/DOUGM/ExtUtils-Embed-" (sha256 (base32 "1w55q0wz6i4k9p500mc4wmr8jndnczb6qqrd2m1mrnx13v2mbr7h"))))
version ".tar.gz"))
(sha256
(base32
"1w55q0wz6i4k9p500mc4wmr8jndnczb6qqrd2m1mrnx13v2mbr7h"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
'(#:tests? #f)) '(#:tests? #f))

View file

@ -52,12 +52,6 @@
(snippet (snippet
'(with-directory-excursion "ext" '(with-directory-excursion "ext"
(for-each delete-file-recursively (for-each delete-file-recursively
;; Some of the bundled libraries have no proper upstream.
;; Ideally we'd extract these out as separate packages:
;;"mbstring/libmbfl"
;;"date/lib"
;;"bcmath/libbcmath"
;;"fileinfo/libmagic" ; a patched version of libmagic
'("gd/libgd" '("gd/libgd"
"pcre/pcre2lib" "pcre/pcre2lib"
"xmlrpc/libxmlrpc")))))) "xmlrpc/libxmlrpc"))))))
@ -71,15 +65,13 @@
(list (with "--with-bz2" "bzip2") (list (with "--with-bz2" "bzip2")
(with "--with-curl" "curl") (with "--with-curl" "curl")
(with "--with-gdbm" "gdbm") (with "--with-gdbm" "gdbm")
(with "--with-gettext" "libc") ; libintl.h (with "--with-gettext" "libc")
(with "--with-gmp" "gmp") (with "--with-gmp" "gmp")
(with "--with-ldap" "openldap") (with "--with-ldap" "openldap")
(with "--with-ldap-sasl" "cyrus-sasl") (with "--with-ldap-sasl" "cyrus-sasl")
(with "--with-pdo-pgsql" "postgresql") (with "--with-pdo-pgsql" "postgresql")
(with "--with-pdo-sqlite" "sqlite") (with "--with-pdo-sqlite" "sqlite")
(with "--with-pgsql" "postgresql") (with "--with-pgsql" "postgresql")
;; PHPs Pspell extension, while retaining its current name,
;; now uses the Aspell library.
(with "--with-pspell" "aspell") (with "--with-pspell" "aspell")
(with "--with-readline" "readline") (with "--with-readline" "readline")
(with "--with-sodium" "libsodium") (with "--with-sodium" "libsodium")
@ -87,18 +79,15 @@
(with "--with-tidy" "tidy") (with "--with-tidy" "tidy")
(with "--with-xsl" "libxslt") (with "--with-xsl" "libxslt")
(with "--with-zlib-dir" "zlib") (with "--with-zlib-dir" "zlib")
;; We could add "--with-snmp", but it requires netsnmp that
;; we don't have a package for. It is used to build the snmp
;; extension of php.
"--with-external-pcre" "--with-external-pcre"
"--with-external-gd" "--with-external-gd"
"--with-iconv" "--with-iconv"
"--with-openssl" "--with-openssl"
"--with-mysqli" ; Required for, e.g. wordpress "--with-mysqli"
"--with-pdo-mysql" "--with-pdo-mysql"
"--with-zip" "--with-zip"
"--with-zlib" "--with-zlib"
"--enable-bcmath" ; Required for, e.g. Zabbix frontend "--enable-bcmath"
"--enable-calendar" "--enable-calendar"
"--enable-dba=shared" "--enable-dba=shared"
"--enable-exif" "--enable-exif"
@ -115,12 +104,9 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'do-not-record-build-flags (add-after 'unpack 'do-not-record-build-flags
(lambda _ (lambda _
;; Prevent configure flags from being stored and causing
;; unnecessary runtime dependencies.
(substitute* "scripts/php-config.in" (substitute* "scripts/php-config.in"
(("@CONFIGURE_OPTIONS@") "") (("@CONFIGURE_OPTIONS@") "")
(("@PHP_LDFLAGS@") "")) (("@PHP_LDFLAGS@") ""))
;; This file has ISO-8859-1 encoding.
(with-fluids ((%default-port-encoding "ISO-8859-1")) (with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* "main/build-defs.h.in" (substitute* "main/build-defs.h.in"
(("@CONFIGURE_COMMAND@") "(omitted)"))))) (("@CONFIGURE_COMMAND@") "(omitted)")))))
@ -130,8 +116,6 @@
(("/bin/sh") (which "sh"))))) (("/bin/sh") (which "sh")))))
(add-before 'check 'prepare-tests (add-before 'check 'prepare-tests
(lambda _ (lambda _
;; Some of these files have ISO-8859-1 encoding, whereas others
;; use ASCII, so we can't use a "catch-all" find-files here.
(with-fluids ((%default-port-encoding "ISO-8859-1")) (with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* '("ext/mbstring/tests/mb_send_mail02.phpt" (substitute* '("ext/mbstring/tests/mb_send_mail02.phpt"
"ext/mbstring/tests/mb_send_mail04.phpt" "ext/mbstring/tests/mb_send_mail04.phpt"
@ -145,20 +129,14 @@
"ext/standard/tests/general_functions/bug44667.phpt" "ext/standard/tests/general_functions/bug44667.phpt"
"ext/standard/tests/general_functions/proc_open.phpt") "ext/standard/tests/general_functions/proc_open.phpt")
(("/bin/cat") (which "cat"))) (("/bin/cat") (which "cat")))
;; The encoding of this file is not recognized, so we simply drop it.
(delete-file "ext/mbstring/tests/mb_send_mail07.phpt") (delete-file "ext/mbstring/tests/mb_send_mail07.phpt")
(substitute* "ext/standard/tests/streams/bug60602.phpt" (substitute* "ext/standard/tests/streams/bug60602.phpt"
(("'ls'") (string-append "'" (which "ls") "'"))) (("'ls'") (string-append "'" (which "ls") "'")))
,@(if (string-prefix? "arm" (or (%current-system) ,@(if (string-prefix? "arm" (or (%current-system)
(%current-target-system))) (%current-target-system)))
;; Drop tests known to fail on armhf.
'((for-each delete-file '((for-each delete-file
(list (list
"ext/calendar/tests/unixtojd_error1.phpt" "ext/calendar/tests/unixtojd_error1.phpt"
;; arm can be a lot slower, so a time-related test fails
"ext/fileinfo/tests/cve-2014-3538-nojit.phpt" "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
"ext/pcntl/tests/pcntl_unshare_01.phpt" "ext/pcntl/tests/pcntl_unshare_01.phpt"
"ext/pcre/tests/bug76514.phpt" "ext/pcre/tests/bug76514.phpt"
@ -174,168 +152,83 @@
"sapi/cli/tests/upload_2G.phpt" "sapi/cli/tests/upload_2G.phpt"
"Zend/tests/concat_003.phpt"))) "Zend/tests/concat_003.phpt")))
'()) '())
,@(if (target-ppc64le?) ,@(if (target-ppc64le?)
;; Drop tests known to fail on powerpc64le.
'((for-each delete-file '((for-each delete-file
(list (list
;; phpdbg watchpoints don't work.
;; Bug tracked upstream at:
;; https://bugs.php.net/bug.php?id=81408
"sapi/phpdbg/tests/watch_001.phpt" "sapi/phpdbg/tests/watch_001.phpt"
"sapi/phpdbg/tests/watch_003.phpt" "sapi/phpdbg/tests/watch_003.phpt"
"sapi/phpdbg/tests/watch_004.phpt" "sapi/phpdbg/tests/watch_004.phpt"
"sapi/phpdbg/tests/watch_005.phpt" "sapi/phpdbg/tests/watch_005.phpt"
"sapi/phpdbg/tests/watch_006.phpt"))) "sapi/phpdbg/tests/watch_006.phpt")))
'()) '())
;; Drop tests that are known to fail.
(for-each delete-file (for-each delete-file
'("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group. '("ext/posix/tests/posix_getgrgid.phpt"
"ext/posix/tests/posix_getgrnam_basic.phpt" ; Requires /etc/group. "ext/posix/tests/posix_getgrnam_basic.phpt"
"ext/sockets/tests/bug63000.phpt" ; Fails to detect OS. "ext/sockets/tests/bug63000.phpt"
"ext/sockets/tests/socket_shutdown.phpt" ; Requires DNS. "ext/sockets/tests/socket_shutdown.phpt"
"ext/sockets/tests/socket_send.phpt" ; Likewise. "ext/sockets/tests/socket_send.phpt"
"ext/sockets/tests/mcast_ipv4_recv.phpt" ; Requires multicast. "ext/sockets/tests/mcast_ipv4_recv.phpt"
;; These needs /etc/services.
"ext/standard/tests/general_functions/getservbyname_basic.phpt" "ext/standard/tests/general_functions/getservbyname_basic.phpt"
"ext/standard/tests/general_functions/getservbyport_basic.phpt" "ext/standard/tests/general_functions/getservbyport_basic.phpt"
"ext/standard/tests/general_functions/getservbyport_variation1.phpt" "ext/standard/tests/general_functions/getservbyport_variation1.phpt"
;; And /etc/protocols.
"ext/standard/tests/network/getprotobyname_basic.phpt" "ext/standard/tests/network/getprotobyname_basic.phpt"
"ext/standard/tests/network/getprotobynumber_basic.phpt" "ext/standard/tests/network/getprotobynumber_basic.phpt"
;; And exotic locales.
"ext/standard/tests/strings/setlocale_basic1.phpt" "ext/standard/tests/strings/setlocale_basic1.phpt"
"ext/standard/tests/strings/setlocale_basic2.phpt" "ext/standard/tests/strings/setlocale_basic2.phpt"
"ext/standard/tests/strings/setlocale_basic3.phpt" "ext/standard/tests/strings/setlocale_basic3.phpt"
"ext/standard/tests/strings/setlocale_variation1.phpt" "ext/standard/tests/strings/setlocale_variation1.phpt"
;; This failing test is skipped on PHP's Travis CI as it is
;; supposedly inaccurate.
"ext/standard/tests/file/disk_free_space_basic.phpt" "ext/standard/tests/file/disk_free_space_basic.phpt"
;; The following test erroneously expect the link
;; count of a sub-directory to increase compared to
;; its parent.
"ext/standard/tests/file/lstat_stat_variation8.phpt" "ext/standard/tests/file/lstat_stat_variation8.phpt"
;; This tests whether microseconds differ enough and
;; fails inconsistently on fast machines.
"ext/date/tests/bug73837.phpt" "ext/date/tests/bug73837.phpt"
;; XXX: These gd tests fails. Likely because our version
;; is different from the (patched) bundled one.
;; Here, gd quits immediately after "fatal libpng error"; while the
;; test expects it to additionally return a "setjmp" error and warning.
"ext/gd/tests/bug39780_extern.phpt" "ext/gd/tests/bug39780_extern.phpt"
"ext/gd/tests/libgd00086_extern.phpt" "ext/gd/tests/libgd00086_extern.phpt"
;; Extra newline in gd-png output.
"ext/gd/tests/bug45799.phpt" "ext/gd/tests/bug45799.phpt"
;; Test expects generic "gd warning" but gets the actual function name.
"ext/gd/tests/createfromwbmp2_extern.phpt" "ext/gd/tests/createfromwbmp2_extern.phpt"
;; This bug should have been fixed in gd 2.2.2.
;; Is it a regression?
"ext/gd/tests/bug65148.phpt" "ext/gd/tests/bug65148.phpt"
;; This bug should have been fixed in the gd 2.2
;; series. Perhaps a regression introduced by gd
;; 2.3.0?
"ext/gd/tests/bug66590.phpt" "ext/gd/tests/bug66590.phpt"
;; This bug should have been fixed in the php-5.5
;; series. Perhaps a regression introduced by gd
;; 2.3.0?
"ext/gd/tests/bug70102.phpt" "ext/gd/tests/bug70102.phpt"
;; This bug should have been fixed in the php-5.6
;; series. Perhaps a regression introduced by gd
;; 2.3.0?
"ext/gd/tests/bug73869.phpt" "ext/gd/tests/bug73869.phpt"
;; Some WebP related tests fail.
"ext/gd/tests/webp_basic.phpt" "ext/gd/tests/webp_basic.phpt"
"ext/gd/tests/imagecreatefromstring_webp.phpt" "ext/gd/tests/imagecreatefromstring_webp.phpt"
;; Expected error message, but from the wrong function
"ext/gd/tests/bug77269.phpt" "ext/gd/tests/bug77269.phpt"
;; TODO: Enable these when libgd is built with xpm support.
"ext/gd/tests/xpm2gd.phpt" "ext/gd/tests/xpm2gd.phpt"
"ext/gd/tests/xpm2jpg.phpt" "ext/gd/tests/xpm2jpg.phpt"
"ext/gd/tests/xpm2png.phpt" "ext/gd/tests/xpm2png.phpt"
;; Whitespace difference, probably caused by a very
;; long store path
"ext/gd/tests/bug77479.phpt" "ext/gd/tests/bug77479.phpt"
;; Expected invalid XBM but got EOF before image was
;; complete. It's a warning in both cases and test
;; result is the same.
"ext/gd/tests/bug77973.phpt" "ext/gd/tests/bug77973.phpt"
;; Test expects uninitialized value to be false, but
;; instead gets "resource(5) of type (gd)".
"ext/gd/tests/bug79067.phpt" "ext/gd/tests/bug79067.phpt"
;; The following test fails with "The image size
;; differs: expected 114x115, got 117x117".
"ext/gd/tests/bug79068.phpt" "ext/gd/tests/bug79068.phpt"
;; XXX: These iconv tests have the expected outcome,
;; but with different error messages.
;; Expects "illegal character", instead gets "unknown error (84)".
"ext/iconv/tests/bug52211.phpt" "ext/iconv/tests/bug52211.phpt"
"ext/iconv/tests/bug60494.phpt" "ext/iconv/tests/bug60494.phpt"
;; Expects "wrong charset", gets unknown error (22).
"ext/iconv/tests/iconv_strlen_error2.phpt" "ext/iconv/tests/iconv_strlen_error2.phpt"
"ext/iconv/tests/iconv_substr_error2.phpt" "ext/iconv/tests/iconv_substr_error2.phpt"
;; Expects conversion error, gets "error condition Termsig=11".
"ext/iconv/tests/iconv_strpos_error2.phpt" "ext/iconv/tests/iconv_strpos_error2.phpt"
"ext/iconv/tests/iconv_strrpos_error2.phpt" "ext/iconv/tests/iconv_strrpos_error2.phpt"
;; Expects "invalid multibyte sequence" but got
;; "unknown error".
"ext/iconv/tests/bug76249.phpt" "ext/iconv/tests/bug76249.phpt"
;; XXX: These test failures appear legitimate, needs investigation.
;; open_basedir() restriction failure.
"ext/curl/tests/bug61948-unix.phpt" "ext/curl/tests/bug61948-unix.phpt"
;; Expects a false boolean, gets empty array from glob().
"ext/standard/tests/file/bug41655_1.phpt" "ext/standard/tests/file/bug41655_1.phpt"
"ext/standard/tests/file/glob_variation5.phpt" "ext/standard/tests/file/glob_variation5.phpt"
;; The test expects an Array, but instead get the contents(?).
"ext/gd/tests/bug43073.phpt" "ext/gd/tests/bug43073.phpt"
;; imagettftext() returns wrong coordinates.
"ext/gd/tests/bug48732-mb.phpt" "ext/gd/tests/bug48732-mb.phpt"
"ext/gd/tests/bug48732.phpt" "ext/gd/tests/bug48732.phpt"
;; Similarly for imageftbbox().
"ext/gd/tests/bug48801-mb.phpt" "ext/gd/tests/bug48801-mb.phpt"
"ext/gd/tests/bug48801.phpt" "ext/gd/tests/bug48801.phpt"
;; Different expected output from imagecolorallocate().
"ext/gd/tests/bug53504.phpt" "ext/gd/tests/bug53504.phpt"
;; Wrong image size after scaling an image.
"ext/gd/tests/bug73272.phpt" "ext/gd/tests/bug73272.phpt"
;; Expects iconv to detect illegal characters, instead gets
;; "unknown error (84)" and heap corruption(!).
"ext/iconv/tests/bug48147.phpt" "ext/iconv/tests/bug48147.phpt"
;; Expects illegal character ".", gets "=?utf-8?Q?."
"ext/iconv/tests/bug51250.phpt" "ext/iconv/tests/bug51250.phpt"
;; iconv throws "buffer length exceeded" on some string checks.
"ext/iconv/tests/iconv_mime_encode.phpt" "ext/iconv/tests/iconv_mime_encode.phpt"
;; file_get_contents(): iconv stream filter
;; ("ISO-8859-1"=>"UTF-8") unknown error.
"ext/standard/tests/file/bug43008.phpt" "ext/standard/tests/file/bug43008.phpt"
;; Table data not created in sqlite(?).
"ext/pdo_sqlite/tests/bug_42589.phpt" "ext/pdo_sqlite/tests/bug_42589.phpt"
;; Expects an Array with 3 preg_matches; gets 0.
"ext/pcre/tests/bug79846.phpt" "ext/pcre/tests/bug79846.phpt"
;; Expects an empty Array; gets one with " " in it.
"ext/pcre/tests/bug80118.phpt" "ext/pcre/tests/bug80118.phpt"
;; Renicing a process fails in the build environment.
"ext/standard/tests/general_functions/proc_nice_basic.phpt" "ext/standard/tests/general_functions/proc_nice_basic.phpt"
;; Can fail on fast machines?
"Zend/tests/bug74093.phpt")) "Zend/tests/bug74093.phpt"))
;; Accomodate two extra openssl errors flanking the expected one:
;; random number generator:RAND_{load,write}_file:Cannot open file
;; This is due to an invalid $HOME, but changing it in the test
;; still prints the first one & changing it globally is overkill.
(substitute* "ext/openssl/tests/bug80747.phpt" (substitute* "ext/openssl/tests/bug80747.phpt"
((".*error:%s:key size too small.*" match) ((".*error:%s:key size too small.*" match)
(string-append "%s\n" match "%s\n"))) (string-append "%s\n" match "%s\n")))
;; Skip tests requiring network access.
(setenv "SKIP_ONLINE_TESTS" "1") (setenv "SKIP_ONLINE_TESTS" "1")
;; Without this variable, 'make test' passes regardless of failures.
(setenv "REPORT_EXIT_STATUS" "1") (setenv "REPORT_EXIT_STATUS" "1")
;; Skip tests requiring I/O facilities that are unavailable in the
;; build environment
(setenv "SKIP_IO_CAPTURE_TESTS" "1")))) (setenv "SKIP_IO_CAPTURE_TESTS" "1"))))
#:test-target "test")) #:test-target "test"))
(inputs (inputs
@ -368,7 +261,7 @@
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("bison" ,bison) ("bison" ,bison)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("procps" ,procps))) ; for tests ("procps" ,procps)))
(synopsis "PHP programming language") (synopsis "PHP programming language")
(description (description
"PHP (PHP Hypertext Processor) is a server-side (CGI) scripting "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting
@ -377,10 +270,9 @@ a general-purpose programming language. PHP code may be embedded into
HTML code, or it can be used in combination with various web template HTML code, or it can be used in combination with various web template
systems, web content management systems and web frameworks.") systems, web content management systems and web frameworks.")
(license (list (license (list
(license:non-copyleft "file://LICENSE") ; The PHP license. (license:non-copyleft "file://LICENSE")
(license:non-copyleft "file://Zend/LICENSE") ; The Zend license. (license:non-copyleft "file://Zend/LICENSE")
license:lgpl2.1 ; ext/mbstring/libmbfl license:lgpl2.1
license:lgpl2.1+ ; ext/bcmath/libbcmath license:lgpl2.1+
license:bsd-2 ; ext/fileinfo/libmagic license:bsd-2
license:expat)))) ; ext/date/lib license:expat))))
php

View file

@ -2,8 +2,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:prefix license:)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-build) #:use-module (gnu packages python-build)
@ -18,9 +17,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "snuggs" version)) (uri (pypi-uri "snuggs" version))
(sha256 (sha256 (base32 "0yv1wayrw9g6k0c2f721kha7wsv0s1fdlxpf5x7f34iqzq9z272h"))))
(base32
"0yv1wayrw9g6k0c2f721kha7wsv0s1fdlxpf5x7f34iqzq9z272h"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-numpy python-pyparsing)) (propagated-inputs (list python-numpy python-pyparsing))
(native-inputs (list python-hypothesis python-pytest)) (native-inputs (list python-hypothesis python-pytest))
@ -36,9 +33,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "affine" version)) (uri (pypi-uri "affine" version))
(sha256 (sha256 (base32 "1l5x66jdrlhaxp9fllkjzfq3bz4xx1a0yknrzycszmks2mkdwxnn"))))
(base32
"1l5x66jdrlhaxp9fllkjzfq3bz4xx1a0yknrzycszmks2mkdwxnn"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (list python-coveralls python-flake8 python-pydocstyle (native-inputs (list python-coveralls python-flake8 python-pydocstyle
python-pytest python-pytest-cov)) python-pytest python-pytest-cov))
@ -47,8 +42,6 @@
(description "Matrices describing affine transformation of the plane.") (description "Matrices describing affine transformation of the plane.")
(license license:bsd-3))) (license license:bsd-3)))
;; un tout petit peu de modifications à faire ici
(define-public python-rasterio (define-public python-rasterio
(package (package
(name "python-rasterio") (name "python-rasterio")
@ -56,9 +49,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "rasterio" version)) (uri (pypi-uri "rasterio" version))
(sha256 (sha256 (base32 "1a21k86g325ks0vllzn9ry6pf8gch45bs9z9iq5z1v3na90731ss"))))
(base32
"1a21k86g325ks0vllzn9ry6pf8gch45bs9z9iq5z1v3na90731ss"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:tests? #f)) '(#:tests? #f))

View file

@ -42,8 +42,7 @@
(propagated-inputs (list python-markupsafe)) (propagated-inputs (list python-markupsafe))
(home-page "https://palletsprojects.com/p/jinja/") (home-page "https://palletsprojects.com/p/jinja/")
(synopsis "A very fast and expressive template engine.") (synopsis "A very fast and expressive template engine.")
(description (description "This package provides a very fast and expressive template engine.")
"This package provides a very fast and expressive template engine.")
(license #f))) (license #f)))
(define-public python-pyyaml (define-public python-pyyaml
@ -68,9 +67,7 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "setuptools_scm" version)) (uri (pypi-uri "setuptools_scm" version))
(sha256 (sha256 (base32 "09wg4zg30ir1c2cvwqipaz3hwaxz503fgw5zdvaxgakilx2q6l3c"))))
(base32
"09wg4zg30ir1c2cvwqipaz3hwaxz503fgw5zdvaxgakilx2q6l3c"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-importlib-metadata python-packaging (propagated-inputs (list python-importlib-metadata python-packaging
python-setuptools python-tomli python-setuptools python-tomli
@ -89,20 +86,12 @@
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "podman-compose" version)) (uri (pypi-uri "podman-compose" version))
(sha256 (sha256 (base32 "1rd29mysfdlbvn0m9zfyp2n0v5lch0bsj4fmzyjaal6akw23bcid"))))
(base32 "1rd29mysfdlbvn0m9zfyp2n0v5lch0bsj4fmzyjaal6akw23bcid"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(propagated-inputs (list python-dotenv python-pyyaml slirp4netns iptables)) (propagated-inputs (list python-dotenv python-pyyaml slirp4netns iptables))
(native-inputs (list python-black python-flake8 python-pre-commit (native-inputs (list python-black python-flake8 python-pre-commit
python-pylint)) python-pylint))
(home-page "https://github.com/containers/podman-compose") (home-page "https://github.com/containers/podman-compose")
(synopsis "A script to run docker-compose.yml using podman") (synopsis "A script to run docker-compose.yml using podman")
(description (description "This package provides a script to run docker-compose.yml using podman")
"This package provides a script to run docker-compose.yml using podman") (license #f)))
(license #f))
)

View file

@ -1,5 +1,3 @@
(define-module (glicid packages r)) (define-module (glicid packages r))
(define-public R (@@ (gnu packages statistics) r-with-tests)) (define-public R (@@ (gnu packages statistics) r-with-tests))
R

View file

@ -19,7 +19,6 @@
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages python) #:use-module (gnu packages python)
; #:use-module (past packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
@ -37,43 +36,28 @@
(uri (string-append (uri (string-append
"https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-" "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-"
version ".zip")) version ".zip"))
(sha256 (sha256 (base32 "0p23k4dipk5nnfpvhhqj9apz8rhnd62qdydjmzx8q78sxpwims4w"))))
(base32
"0p23k4dipk5nnfpvhhqj9apz8rhnd62qdydjmzx8q78sxpwims4w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("gcc-toolchain" ,gcc-toolchain))) (inputs `(("gcc-toolchain" ,gcc-toolchain)))
(synopsis (synopsis "Loki is a C++ library of designs, containing flexible implementations of common design patterns and idioms.")
"Loki is a C++ library of designs, containing flexible implementations of common design patterns and idioms.") (description "Loki is the name of a C++ software library written by Andrei Alexandrescu as part of his book Modern C++ Design.
(description
"Loki is the name of a C++ software library written by Andrei Alexandrescu as part of his book Modern C++ Design.
The library makes extensive use of C++ template metaprogramming and implements several commonly used tools: typelist, functor, singleton, smart pointer, object factory, visitor and multimethods.") The library makes extensive use of C++ template metaprogramming and implements several commonly used tools: typelist, functor, singleton, smart pointer, object factory, visitor and multimethods.")
(home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage") (home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage")
(license gpl3+))) (license gpl3+)))
;; was commented out… guix repl is ok… so uncomment right now
(define-public yade-2022.01a (define-public yade-2022.01a
(package (package
(name "yade") (name "yade")
(version "2022.01a") (version "2022.01a")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" version ".tar.gz"))
"https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" (sha256 (base32 "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv"))))
version ".tar.gz"))
(sha256
(base32
"0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF" `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF"
(string-append "-DCMAKE_INSTALL_PREFIX=" (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out"))
(assoc-ref %outputs "out")) (string-append "-DQGLVIEWER_INCLUDE_DIR=" (assoc-ref %build-inputs "libqglviewer")))
(string-append "-DQGLVIEWER_INCLUDE_DIR="
(assoc-ref %build-inputs
"libqglviewer")))
;; (string-append "-DQGLVIEWER_INCLUDE_DIR="
;; libqglviewer))))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'post-unpack (add-after 'unpack 'post-unpack
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
@ -85,13 +69,10 @@
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(apply invoke "cmake" "../" configure-flags))))) (apply invoke "cmake" "../" configure-flags)))))
#:tests? #f)) #:tests? #f))
;; (lambda _ (invoke
;; "cmake" "../trunk"
;; configure-flags))))))
(propagated-inputs `(("gdb" ,gdb) (propagated-inputs `(("gdb" ,gdb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("openmpi" ,openmpi) ("openmpi" ,openmpi)
("python" ,python) ;; beware python 3.10 is *NOT* supported ("python" ,python)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("python-matplotlib" ,python-matplotlib) ("python-matplotlib" ,python-matplotlib)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
@ -106,15 +87,11 @@
("python-qtpy" ,python-qtpy))) ("python-qtpy" ,python-qtpy)))
(inputs `(("boost" ,boost) (inputs `(("boost" ,boost)
("qtbase-5" ,qtbase-5) ("qtbase-5" ,qtbase-5)
;; ("qt" ,qt)
("freeglut" ,freeglut) ("freeglut" ,freeglut)
("gts" ,gts) ("gts" ,gts)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("libqglviewer" ,libqglviewer) ("libqglviewer" ,libqglviewer)
("eigen" ,eigen) ("eigen" ,eigen)
;; ("loki" ,loki)
;; ("vtk" ,vtk)
;; ("qtwebkit" ,qtwebkit)
("openblas" ,openblas) ("openblas" ,openblas)
("suitesparse" ,suitesparse) ("suitesparse" ,suitesparse)
("gcc-toolchain" ,gcc-toolchain) ("gcc-toolchain" ,gcc-toolchain)
@ -124,10 +101,8 @@
("qtwebengine" ,qtwebengine) ("qtwebengine" ,qtwebengine)
("mpfr" ,mpfr))) ("mpfr" ,mpfr)))
(synopsis (synopsis "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.")
"Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.") (description "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new algorithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.")
(description
"Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new algorithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.")
(home-page "https://www.yade-dem.org/") (home-page "https://www.yade-dem.org/")
(license gpl3+))) (license gpl3+)))
@ -137,20 +112,13 @@
(version "2023.02a") (version "2023.02a")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "https://gitlab.com/yade-dev/trunk/-/archive/2023.02a/trunk-" version ".tar.gz"))
"https://gitlab.com/yade-dev/trunk/-/archive/2023.02a/trunk-" (sha256 (base32 "1hdhxyaqdavrwpvam759835zyhn49c777kclz9p720pjlw55lszp"))))))
version ".tar.gz"))
(sha256
(base32
"1hdhxyaqdavrwpvam759835zyhn49c777kclz9p720pjlw55lszp"))))))
(define-public yade yade-2022.01a) (define-public yade yade-2022.01a)
(define-public yade-glicid-waves (define-public yade-glicid-waves
(package (package
; (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi)
; yade) "waves"))
(inherit yade) (inherit yade)
(name "yade-glicid-waves"))) (name "yade-glicid-waves")))

View file

@ -3,60 +3,36 @@
(use-modules (guix packages) (use-modules (guix packages)
(guix git-download) (guix git-download)
(guix download) (guix download)
; (guix utils)
(gnu packages) (gnu packages)
(gnu packages storage) (gnu packages storage)
(gnu packages crypto) (gnu packages crypto)
(gnu packages python-xyz) ; wcwidth (gnu packages python-xyz)
(gnu packages linux) ; liburing (gnu packages linux)
) )
(define-public ceph-upstream (define-public ceph-upstream
(package (package
(inherit ceph) (inherit ceph)
(name "ceph-upstream") (name "ceph-upstream")
; (version "17.2.7releasetag")
(version "17.2.7") (version "17.2.7")
; (source (origin
; (method git-fetch)
; (uri (git-reference
; (url "https://github.com/ceph/ceph.git")
; (commit "b12291d110049b2f35e32e0de30d70e9a4c060d2") ;; last version 20240906
;; (branch "quincy")
;
; (recursive? #t)))
; (file-name version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.ceph.com/tarballs/ceph-" (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz"))
version ".tar.gz")) (sha256 (base32 "1612424yrf39dz010ygz8k5x1vc8731549ckfj1r39dg00m62klp"))
(sha256
(base32
"1612424yrf39dz010ygz8k5x1vc8731549ckfj1r39dg00m62klp"))
(patches (patches
(search-patches (search-patches "ceph-disable-cpu-optimizations.patch"))
"ceph-disable-cpu-optimizations.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(for-each delete-file-recursively '(for-each delete-file-recursively
'(;; TODO: Unbundle these: '(
"src/arrow" "src/arrow"
;;"src/isa-l"
;;"src/lua"
;;"src/xxHash"
;;"src/zstd"
;;"src/civetweb"
"src/c-ares" "src/c-ares"
"src/fmt" "src/fmt"
"src/googletest" "src/googletest"
"src/rapidjson" "src/rapidjson"
"src/spdk" "src/spdk"
"src/rocksdb" "src/rocksdb"
; "src/boost" ; inexistant ??
"src/utf8proc"))))) "src/utf8proc")))))
(inputs (modify-inputs (package-inputs ceph) (append liburing libxcrypt))) (inputs (modify-inputs (package-inputs ceph) (append liburing libxcrypt)))
(native-inputs (modify-inputs (package-native-inputs ceph) (native-inputs (modify-inputs (package-native-inputs ceph)
(append python-wcwidth))))) (append python-wcwidth)))))

View file

@ -8,10 +8,8 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (glicid utils)) #:use-module (glicid utils))
(define-public qemu-latest (define-public qemu-latest qemu)
qemu) (define-public qemu-minimal-latest qemu-minimal)
(define-public qemu-minimal-latest
qemu-minimal)
(define-public qemu-with-rbd (define-public qemu-with-rbd
(package (package

View file

@ -63,5 +63,3 @@ Secure. NetBird enables secure remote access by applying granular access policie
(description "netbird client ui program. dirty version from github artifacts.") (description "netbird client ui program. dirty version from github artifacts.")
(home-page %netbird-homepage) (home-page %netbird-homepage)
(license license:expat))) (license license:expat)))
netbird-cli

View file

@ -11,14 +11,11 @@
rc-local-configuration? rc-local-configuration?
rc-local-service rc-local-service
rc-local-service-type rc-local-service-type
%default-rc-multiplelocal-conf %default-rc-multiplelocal-conf
rc-multiplelocal-configuration rc-multiplelocal-configuration
rc-multiplelocal-configuration? rc-multiplelocal-configuration?
rc-multiplelocal-service rc-multiplelocal-service
rc-multiplelocal-service-type rc-multiplelocal-service-type
)) ))
(define %default-rc-local-conf (define %default-rc-local-conf

View file

@ -3,18 +3,11 @@
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module ((gnu services virtualization) #:prefix gnu:) #:use-module ((gnu services virtualization) #:prefix gnu:)
#:use-module ((gnu packages virtualization) #:prefix gnu:) #:use-module ((gnu packages virtualization) #:prefix gnu:)
; #:use-module (guix records) #:use-module (guix gexp)
; #:use-module (guix utils) #:use-module (gnu services configuration)
#:use-module (guix gexp) ;; file-like?
#:use-module (gnu services configuration) ;; define-configuration
#:export (qemu-guest-agent-service-type) #:export (qemu-guest-agent-service-type)
) )
(define gnu:qemu-guest-agent-configuration-qemu (@@ (gnu services virtualization) qemu-guest-agent-configuration-qemu)) (define gnu:qemu-guest-agent-configuration-qemu (@@ (gnu services virtualization) qemu-guest-agent-configuration-qemu))
(define gnu:qemu-guest-agent-configuration-device (@@ (gnu services virtualization) qemu-guest-agent-configuration-device)) (define gnu:qemu-guest-agent-configuration-device (@@ (gnu services virtualization) qemu-guest-agent-configuration-device))
@ -24,8 +17,7 @@
(list (list
(shepherd-service (shepherd-service
(provision '(qemu-guest-agent)) (provision '(qemu-guest-agent))
(requirement '(udev)) ;; GLiCID (requirement '(udev))
(documentation "Run the QEMU guest agent.") (documentation "Run the QEMU guest agent.")
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
`(,(string-append #$qemu "/bin/qemu-ga") `(,(string-append #$qemu "/bin/qemu-ga")
@ -36,12 +28,10 @@
#:log-file "/var/log/qemu-ga.log")) #:log-file "/var/log/qemu-ga.log"))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define qemu-guest-agent-service-type (define qemu-guest-agent-service-type
(service-type (service-type
(inherit gnu:qemu-guest-agent-service-type) (inherit gnu:qemu-guest-agent-service-type)
(extensions (extensions
(list (service-extension shepherd-root-service-type (list (service-extension shepherd-root-service-type
qemu-guest-agent-shepherd-service))) qemu-guest-agent-shepherd-service)))))
))

View file

@ -1,9 +1,8 @@
(define-module (glicid system file-systems) (define-module (glicid system file-systems)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:export (%cgroups)
) )
(define %cgroups (define-public %cgroups
(append (list (append (list
(file-system (file-system
(device "none") (device "none")
@ -59,5 +58,4 @@
(create-mount-point? #t) (create-mount-point? #t)
(dependencies (list (car %control-groups))) (dependencies (list (car %control-groups)))
) )
) %control-groups ) ) %control-groups ))
)

View file

@ -6,33 +6,27 @@
#:use-module (glicid packages gcc) #:use-module (glicid packages gcc)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (gnu packages) #:use-module (gnu packages)
#:export ( )
latest-version
gcc11-instead-of-gcc
transform-package
instead-of
touch
))
(define (latest-version v1 v2) (define-public (latest-version v1 v2)
(case (version-compare (package-version v1) (package-version v2)) (case (version-compare (package-version v1) (package-version v2))
((>) v1) ((>) v1)
((=) v1) ((=) v1)
((<) v2))) ((<) v2)))
(define gcc11-instead-of-gcc (define-public gcc11-instead-of-gcc
(package-input-rewriting (package-input-rewriting
`((,gcc-toolchain . ,gcc-toolchain-11) `((,gcc-toolchain . ,gcc-toolchain-11)
(,gfortran-toolchain . ,gfortran-toolchain-11) (,gfortran-toolchain . ,gfortran-toolchain-11)
))) )))
(define (transform-package original-package suffix) (define-public (transform-package original-package suffix)
(package (package
(inherit original-package) (inherit original-package)
(name (string-append (package-name original-package) "-" suffix )))) (name (string-append (package-name original-package) "-" suffix ))))
(define (instead-of package-a-spec package-b) (define-public (instead-of package-a-spec package-b)
(package-input-rewriting/spec `( (,package-a-spec . ,(const package-b))))) (package-input-rewriting/spec `( (,package-a-spec . ,(const package-b)))))
(define (touch filename) (define-public (touch filename)
(call-with-output-file file-name (const #t))) (call-with-output-file file-name (const #t)))