GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-29 21:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use guix style on *.scm

Browse source
This commit is contained in:
Yann Dupont 2023-01-02 11:18:12 +01:00
parent a85adcc847
commit 09e78ddc85
28 changed files with 1981 additions and 2065 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
glicid/packages/admin.scm
View file

@ -1,5 +1,6 @@
(define-module (glicid packages admin) (define-module (glicid packages admin)
#:use-module ((gnu packages admin) #:prefix gnu:) #:use-module ((gnu packages admin)
#:prefix gnu:)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
@ -12,11 +13,11 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (glicid packages python) #:use-module (glicid packages python))
)
(define-public shadow (define-public shadow
(package (package
@ -25,8 +26,12 @@
(version "4.13") (version "4.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz"))) (uri (list (string-append
(sha256 (base32 "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls")))))) "https://github.com/shadow-maint/shadow/releases/download/v"
version "/shadow-" version ".tar.xz")))
(sha256
(base32
"0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls"))))))
(define-public sudo (define-public sudo
(let* ((sudo-minimal gnu:sudo)) (let* ((sudo-minimal gnu:sudo))
@ -36,16 +41,11 @@
(arguments (arguments
(substitute-keyword-arguments (package-arguments sudo-minimal) (substitute-keyword-arguments (package-arguments sudo-minimal)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list `(append (list "--enable-sasl" "--with-ldap" "--enable-openssl"
"--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)
(append openldap (append openldap openssl cyrus-sasl)))
openssl
cyrus-sasl)))
(native-inputs (modify-inputs (package-native-inputs sudo-minimal) (native-inputs (modify-inputs (package-native-inputs sudo-minimal)
(append pkg-config)))))) (append pkg-config))))))
@ -57,7 +57,9 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm")))) (sha256
(base32
"09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm"))))
(propagated-inputs (list ansible-core)))) (propagated-inputs (list ansible-core))))
(define-public ansible-core (define-public ansible-core
@ -68,12 +70,12 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri name version)) (uri (pypi-uri name version))
(sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf")))) (sha256
(base32
"120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf"))))
(arguments (arguments
`( `(#:tests? #f
#:tests? #f #:phases (modify-phases %standard-phases
#:phases
(modify-phases %standard-phases
(delete 'sanity-check)))))) (delete 'sanity-check))))))
shadow shadow

19
glicid/packages/algebra.scm
View file

@ -2,8 +2,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement))
)
(define-public fftw-openmpi-with-fortran (define-public fftw-openmpi-with-fortran
(package (package
@ -12,12 +11,10 @@
(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 ".tar.gz")) (uri (string-append "https://www.fftw.org/fftw-" version
(sha256 (base32 "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan")) ".tar.gz"))
)) (sha256
(inputs `( (base32
("gfortran-toolchain", gfortran-toolchain) "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan"))))
,@(package-inputs fftw-openmpi) (inputs `(("gfortran-toolchain" ,gfortran-toolchain)
)) ,@(package-inputs fftw-openmpi)))))
)
)

107
glicid/packages/benchmark.scm
View file

@ -2,36 +2,33 @@
#: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) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module ((gnu packages benchmark) #:prefix gnu:) #:use-module ((gnu packages benchmark)
#: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
(inherit gnu:intel-mpi-benchmarks/openmpi) (inherit gnu:intel-mpi-benchmarks/openmpi)
(name "intel-mpi-benchmarks-upstream") (name "intel-mpi-benchmarks-upstream")
(version "2021.3") (version "2021.3")
(source (source (origin
(origin
(inherit (package-source gnu:intel-mpi-benchmarks/openmpi)) (inherit (package-source gnu:intel-mpi-benchmarks/openmpi))
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(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 (base32 "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h")) (sha256
) (base32
) "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h"))))))
)
)
;(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma ;(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma
; (transform-package ( ; (transform-package (
@ -52,13 +49,8 @@
;) ;)
(define-public intel-mpi-benchmarks/openmpi-2021.3-waves (define-public intel-mpi-benchmarks/openmpi-2021.3-waves
(transform-package ( (transform-package ((instead-of "openmpi" openmpi-glicid-waves)
(instead-of "openmpi" openmpi-glicid-waves) intel-mpi-benchmarks/openmpi-2021.3) "waves"))
intel-mpi-benchmarks/openmpi-2021.3
) "waves")
)
(define-public stream-benchmarks (define-public stream-benchmarks
(package (package
@ -66,45 +58,32 @@
(version "5.10-jh") (version "5.10-jh")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (uri (git-reference
(git-reference
(url "https://github.com/jeffhammond/STREAM.git") (url "https://github.com/jeffhammond/STREAM.git")
(commit "HEAD") (commit "HEAD")))
) (sha256
) (base32
(sha256 (base32 "1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m")) "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 `(#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (delete 'configure) ;no configure
(delete 'configure) ; no configure (delete 'check) ;no check
(delete 'check) ; no 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 » ;; Le Makefile du paquet ne fournit pas de règle « install »
;; alors on le fait nous-mêmes. ;; alors on le fait nous-mêmes.
(let (let ((bin (string-append (assoc-ref outputs "out")
((bin (string-append (assoc-ref outputs "out") "/bin"))) "/bin")))
(install-file "stream_c.exe" bin) (install-file "stream_c.exe" bin)
(install-file "stream_f.exe" bin) (install-file "stream_f.exe" bin) #t))))))
#t (inputs `(("gfortran-toolchain" ,gfortran-toolchain)))
)
)
)
)
)
)
(inputs `(
("gfortran-toolchain" ,gfortran-toolchain)
))
(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+) ;check…
) ))
)
;;defined by gricad / PA Boutier ;;defined by gricad / PA Boutier
@ -114,29 +93,23 @@
(version "5.8") (version "5.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" version ".tgz")) (uri (string-append
(sha256 (base32 "19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f")) "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-"
)) version ".tgz"))
(sha256
(base32
"19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases (modify-phases %standard-phases
(modify-phases %standard-phases
(add-after 'unpack 'setenv (add-after 'unpack 'setenv
(lambda _ (lambda _
(setenv "CC" (which "mpicc")) (setenv "CC"
(setenv "CXX" (which "mpic++")) (which "mpicc"))
#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")
(home-page "https://mvapich.cse.ohio-state.edu/benchmarks/") (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
(license license:gpl2+) (license license:gpl2+)))
)
)

45
glicid/packages/clam.scm
View file

@ -1,27 +1,28 @@
(define-module (glicid packages clam) (define-module (glicid packages clam)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages storage) #:use-module (gnu packages storage)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (glicid packages glicid) #:use-module (glicid packages glicid)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:use-module (guix git-download) #:prefix license:)
#:use-module (gnu packages python) #:use-module (guix git-download)
#:use-module (guix build-system python) #:use-module (gnu packages python)
#:use-module (gnu packages python-web) #:use-module (guix build-system python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages check) #:use-module (gnu packages python-crypto)
#:use-module (guix build-system copy) #:use-module (gnu packages check)
#:use-module (gnu packages django) #:use-module (guix build-system copy)
#:use-module (gnu packages time) #:use-module (gnu packages django)
#:use-module (gnu packages databases) #:use-module (gnu packages time)
#:use-module (gnu packages python-build) ;; setup-tools moved here. #:use-module (gnu packages databases)
) #:use-module (gnu packages python-build) ;setup-tools moved here.
)
;(define-public python-pytest-runner-4.5.1 ;(define-public python-pytest-runner-4.5.1
; (package ; (package

54
glicid/packages/cluster.scm
View file

@ -2,9 +2,9 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module ((gnu packages cluster) #:prefix gnu:) #:use-module ((gnu packages cluster)
#:use-module (glicid utils) #:prefix gnu:)
) #:use-module (glicid utils))
(define-public keepalived-upstream-2.2.4 (define-public keepalived-upstream-2.2.4
(package (package
@ -13,11 +13,12 @@
(version "2.2.4") (version "2.2.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" )) "http://www.keepalived.org/software/keepalived-" version
)) ".tar.gz"))
) (sha256
) (base32
"1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01"))))))
(define-public keepalived-upstream-2.2.7 (define-public keepalived-upstream-2.2.7
(package (package
@ -26,33 +27,26 @@
(version "2.2.7") (version "2.2.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "17flnzcs8hpj1g8nhhqn6bwbvpksyizcyzk2ah55cjhmfkc406f6" )) "http://www.keepalived.org/software/keepalived-" version
)) ".tar.gz"))
) (sha256
) (base32
"17flnzcs8hpj1g8nhhqn6bwbvpksyizcyzk2ah55cjhmfkc406f6"))))))
(define local:keepalived
(define local:keepalived keepalived-upstream-2.2.7) keepalived-upstream-2.2.7)
(define keepalived-latest (latest-version local:keepalived gnu:keepalived)) (define keepalived-latest
(latest-version local:keepalived gnu:keepalived))
(define-public keepalived-glicid (define-public keepalived-glicid
(package (package
(inherit keepalived-latest) (inherit keepalived-latest)
(name "keepalived-glicid") (name "keepalived-glicid")
(version (string-append (package-version keepalived-latest) "-glicid" )) (version (string-append (package-version keepalived-latest) "-glicid"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags (list (string-append "--enable-snmp")
(list
(string-append "--enable-snmp")
(string-append "--enable-snmp-checker") (string-append "--enable-snmp-checker")
(string-append "--enable-snmp-rfc") (string-append "--enable-snmp-rfc"))))
) (inputs `(("net-snmp" ,net-snmp)
) ,@(package-inputs keepalived-latest)))))
)
(inputs `(
("net-snmp", net-snmp)
,@(package-inputs keepalived-latest)
))
)
)

160
glicid/packages/containers.scm
View file

@ -2,8 +2,10 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:use-module ((gnu packages containers) #:prefix gnu:) #:prefix license:)
#:use-module ((gnu packages containers)
#:prefix gnu:)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
@ -12,8 +14,7 @@
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu))
)
(define-public podman (define-public podman
(package (package
@ -21,72 +22,81 @@
(version "4.3.1") (version "4.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") "https://github.com/containers/podman/archive/refs/tags/v"
)) version ".tar.gz")))
(sha256 (base32 "04w8lwybsxix4ms6gnsj2xp4xkm567fj0vnlwmjn7kbqxv22jp25")) (sha256
)) (base32
"04w8lwybsxix4ms6gnsj2xp4xkm567fj0vnlwmjn7kbqxv22jp25"))))
(home-page "https://podman.io") (home-page "https://podman.io")
(synopsis "Manage containers, images, pods, and their volumes") (synopsis "Manage containers, images, pods, and their volumes")
(description "Podman (the POD MANager) is a tool for managing containers and images, volumes mounted into those containers, and pods made from groups of containers.") (description
"Podman (the POD MANager) is a tool for managing containers and images, volumes mounted into those containers, and pods made from groups of containers.")
(license license:asl2.0) (license license:asl2.0)
(inputs (list btrfs-progs gnu:cni-plugins gnu:conmon gnu:crun gpgme go-github-com-go-md2man iptables libassuan libseccomp libselinux gnu:slirp4netns )) (inputs (list btrfs-progs
(native-inputs (list bats git go pkg-config )) gnu:cni-plugins
gnu:conmon
gnu:crun
gpgme
go-github-com-go-md2man
iptables
libassuan
libseccomp
libselinux
gnu:slirp4netns))
(native-inputs (list bats git go pkg-config))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list #:make-flags #~(list #$(string-append "CC="
#:make-flags (cc-for-target))
#~(list #$(string-append "CC=" (cc-for-target)) (string-append "PREFIX="
(string-append "PREFIX=" #$output) #$output))
)
#:tests? #f #:tests? #f
#:test-target "test" #:test-target "test"
#:phases #:phases #~(modify-phases %standard-phases
#~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")))
)
)
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "make" "localsystem") (invoke "make" "localsystem")
(invoke "make" "remotesystem") (invoke "make" "remotesystem"))))
)
)
)
(add-after 'unpack 'fix-hardcoded-paths (add-after 'unpack 'fix-hardcoded-paths
(lambda _ (lambda _
(substitute* (substitute* (find-files "libpod" "\\.go")
(find-files "libpod" "\\.go") (("exec.LookPath[(][\"]slirp4netns[\"][)]")
(("exec.LookPath[(][\"]slirp4netns[\"][)]") (string-append "exec.LookPath(\"" (which "slirp4netns") "\")")) (string-append "exec.LookPath(\""
) (which "slirp4netns") "\")")))
(substitute* "hack/install_catatonit.sh" (("CATATONIT_PATH=\"[^\"]+\"") (string-append "CATATONIT_PATH=" (which "true")))) (substitute* "hack/install_catatonit.sh"
(substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go" (("/usr/local/libexec/podman")(string-append #$output "/bin"))) (("CATATONIT_PATH=\"[^\"]+\"")
(string-append "CATATONIT_PATH="
(which "true"))))
(substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
(("/usr/local/libexec/podman")
(string-append #$output "/bin")))
(substitute* "vendor/github.com/containers/common/pkg/config/default.go" (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
(("/usr/libexec/podman/conmon") (which "conmon")) (("/usr/local/libexec/cni") (string-append #$(this-package-input "cni-plugins") "/bin")) (("/usr/libexec/podman/conmon")
(("/usr/bin/crun") (which "crun")) (which "conmon"))
) (("/usr/local/libexec/cni")
) (string-append #$(this-package-input
) "cni-plugins") "/bin"))
(("/usr/bin/crun")
(which "crun")))))
(add-after 'unpack 'build-no-docs (add-after 'unpack 'build-no-docs
(lambda _ (lambda _
(substitute* "Makefile" (("all: binaries docs") "all: binaries")) (substitute* "Makefile"
(substitute* "Makefile" (("install: install.bin install.remote install.man install.systemd") "install: install.bin install.remote install.systemd")) (("all: binaries docs")
) "all: binaries"))
) (substitute* "Makefile"
(("install: install.bin install.remote install.man install.systemd")
"install: install.bin install.remote install.systemd"))))
(add-after 'install 'install-completions (add-after 'install 'install-completions
(lambda _ (lambda _
(invoke "make" "install.completions" (string-append "PREFIX=" #$output)) (invoke "make" "install.completions"
) (string-append "PREFIX="
) #$output)))))))))
)
)
)
)
)
(define-public podman-4.3.0 (define-public podman-4.3.0
(package (package
@ -95,13 +105,12 @@
(version "4.3.0") (version "4.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") "https://github.com/containers/podman/archive/refs/tags/v"
)) version ".tar.gz")))
(sha256 (base32 "0d5zfi6drac23vb2la2v5s2g27hbz9wgiyvlxfm7hgzjh2ds18sm")) (sha256
)) (base32
) "0d5zfi6drac23vb2la2v5s2g27hbz9wgiyvlxfm7hgzjh2ds18sm"))))))
)
;; YD : now uptreamed… ;; YD : now uptreamed…
@ -127,13 +136,12 @@
(version "4.2.0") (version "4.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") "https://github.com/containers/podman/archive/refs/tags/v"
)) version ".tar.gz")))
(sha256 (base32 "1x5jmmz78ggnlyidc0ivcghpkysd4zkm598jjbf9gkaw09cvry0m")) (sha256
)) (base32
) "1x5jmmz78ggnlyidc0ivcghpkysd4zkm598jjbf9gkaw09cvry0m"))))))
)
(define-public podman-4.1.1 (define-public podman-4.1.1
(package (package
@ -142,13 +150,12 @@
(version "4.1.1") (version "4.1.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") "https://github.com/containers/podman/archive/refs/tags/v"
)) version ".tar.gz")))
(sha256 (base32 "198hdf8wg50zcgrl3982yj3xd227224r7mgb135r9vmgn7lk5gr7")) (sha256
)) (base32
) "198hdf8wg50zcgrl3982yj3xd227224r7mgb135r9vmgn7lk5gr7"))))))
)
(define-public podman-4.1.0 (define-public podman-4.1.0
(package (package
@ -157,10 +164,9 @@
(version "4.1.0") (version "4.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") "https://github.com/containers/podman/archive/refs/tags/v"
)) version ".tar.gz")))
(sha256 (base32 "158fyxv2hd1nwirabrwxascl9lkdphhv0knwrk0qdm0ifcmf257q")) (sha256
)) (base32
) "158fyxv2hd1nwirabrwxascl9lkdphhv0knwrk0qdm0ifcmf257q"))))))
)

115
glicid/packages/fabric-management.scm
View file

@ -1,105 +1,92 @@
(define-module (glicid packages fabric-management) (define-module (glicid packages fabric-management)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module ((gnu packages fabric-management) #:prefix gnu:) #:use-module ((gnu packages fabric-management)
#:prefix gnu:)
#:use-module (glicid packages linux) #:use-module (glicid packages linux)
#:use-module (glicid utils) #:use-module (glicid utils)
) )
(define-public ucx-upstream-1.11.2 (define-public ucx-upstream-1.11.2
(package (package
(inherit gnu:ucx) (inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream" )) (name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.11.2") (version "1.11.2")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) (uri (string-append
(sha256 (base32 "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy")) "https://github.com/openucx/ucx/releases/download/v"
) version "/ucx-" version ".tar.gz"))
) (sha256
) (base32
) "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy"))))))
(define-public ucx-upstream-1.12.0 (define-public ucx-upstream-1.12.0
(package (package
(inherit gnu:ucx) (inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream" )) (name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.12.0") (version "1.12.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) (uri (string-append
(sha256 (base32 "1djxsakwjwnw21hhzsr02w6h2jd2k16bm4pah4iz6k8s5pg99sck")) "https://github.com/openucx/ucx/releases/download/v"
) version "/ucx-" version ".tar.gz"))
) (sha256
) (base32
) "1djxsakwjwnw21hhzsr02w6h2jd2k16bm4pah4iz6k8s5pg99sck"))))))
(define-public ucx-upstream-1.12.1 (define-public ucx-upstream-1.12.1
(package (package
(inherit gnu:ucx) (inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream" )) (name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.12.1") (version "1.12.1")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) (uri (string-append
(sha256 (base32 "13mf30gdcqix8dyi0iwnsd5fn8b0syr03042y99s556swz44gd20")) "https://github.com/openucx/ucx/releases/download/v"
) version "/ucx-" version ".tar.gz"))
) (sha256
) (base32
) "13mf30gdcqix8dyi0iwnsd5fn8b0syr03042y99s556swz44gd20"))))))
(define-public ucx-upstream-1.13.0 (define-public ucx-upstream-1.13.0
(package (package
(inherit gnu:ucx) (inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream" )) (name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.13.0") (version "1.13.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) (uri (string-append
(sha256 (base32 "0gay9qsyz5ia68sakq1dakvk3sblh4fawnwzg09q2y723zr82f4a")) "https://github.com/openucx/ucx/releases/download/v"
) version "/ucx-" version ".tar.gz"))
) (sha256
) (base32
) "0gay9qsyz5ia68sakq1dakvk3sblh4fawnwzg09q2y723zr82f4a"))))))
(define-public ucx-upstream-1.13.1 (define-public ucx-upstream-1.13.1
(package (package
(inherit gnu:ucx) (inherit gnu:ucx)
(name (string-append (package-name gnu:ucx) "-upstream" )) (name (string-append (package-name gnu:ucx) "-upstream"))
(version "1.13.1") (version "1.13.1")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) (uri (string-append
(sha256 (base32 "0a1qvnlvj2k5xgzkfs3md8ai3mmz6i1zv8w2rhm1s4wfnqlpihzg")) "https://github.com/openucx/ucx/releases/download/v"
) version "/ucx-" version ".tar.gz"))
) (sha256
) (base32
) "0a1qvnlvj2k5xgzkfs3md8ai3mmz6i1zv8w2rhm1s4wfnqlpihzg"))))))
(define local-ucx
(define local-ucx ucx-upstream-1.13.1) ucx-upstream-1.13.1)
(define-public ucx-latest (latest-version local-ucx gnu:ucx)) (define-public ucx-latest
(latest-version local-ucx gnu:ucx))
(define-public ucx-latest-rdma (define-public ucx-latest-rdma
(transform-package (transform-package ((instead-of "rdma-core" rdma-core-latest)
( ucx-latest) "rdma"))
(instead-of "rdma-core" rdma-core-latest)
ucx-latest
) "rdma"
)
)
(define-public ucx-latest-glicid (define-public ucx-latest-glicid
(transform-package (transform-package ((instead-of "libfabric" libfabric-latest)
( ucx-latest-rdma) "glicid"))
(instead-of "libfabric" libfabric-latest)
ucx-latest-rdma
) "glicid"
)
)

68
glicid/packages/file-systems.scm
View file

@ -1,5 +1,6 @@
(define-module (glicid packages file-systems) (define-module (glicid packages file-systems)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#: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,38 +19,42 @@
#: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
(package (package
(name "autofs-glicid") (name "autofs-glicid")
(version "5.1.8") (version "5.1.8")
(source (source (origin
(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) "/" "v"
"autofs-" version ".tar.xz")) (version-major version)
"/"
"autofs-"
version
".tar.xz"))
(sha256 (sha256
(base32 "1zf0fgf6kr9amxq5amlgsp1v13sizwl3wvx2xl7b4r2nhmci0gdk")))) (base32
"1zf0fgf6kr9amxq5amlgsp1v13sizwl3wvx2xl7b4r2nhmci0gdk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags (list "--enable-ignore-busy" ;during shutdown
(list "--enable-ignore-busy" ; during shutdown "--enable-sloppy-mount" ;support mount(8) -s
"--enable-sloppy-mount" ; support mount(8) -s
"--with-libtirpc" "--with-libtirpc"
(string-append "--with-openldap=" (string-append "--with-openldap="
(assoc-ref %build-inputs "openldap")) (assoc-ref %build-inputs
"openldap"))
(string-append "--with-sasl=" (string-append "--with-sasl="
(assoc-ref %build-inputs "cyrus-sasl")) (assoc-ref %build-inputs
; "HAVE_SSS_AUTOFS=1" ; required to make sssldir click "cyrus-sasl"))
; (string-append "sssldir=" ;; "HAVE_SSS_AUTOFS=1" ; required to make sssldir click
; (assoc-ref %build-inputs "sssd") ;; (string-append "sssldir="
; "/lib/sssd/modules") ;; (assoc-ref %build-inputs "sssd")
;; "/lib/sssd/modules")
) )
#:tests? #f ; no test suite #:tests? #f ;no test suite
#:phases #:phases (modify-phases %standard-phases
(modify-phases %standard-phases
(add-before 'configure 'fix-hard-coded-search-path (add-before 'configure 'fix-hard-coded-search-path
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
@ -68,19 +73,17 @@
(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 (native-inputs (list bison flex pkg-config rpcsvc-proto))
(list bison flex pkg-config rpcsvc-proto)) (inputs (list cyrus-sasl
(inputs e2fsprogs ;for e[234]fsck
(list cyrus-sasl
e2fsprogs ; for e[234]fsck
libtirpc libtirpc
libxml2 ; needed for LDAP, SASL libxml2 ;needed for LDAP, SASL
mit-krb5 ; needed for LDAP, SASL mit-krb5 ;needed for LDAP, SASL
nfs-utils ; for mount.nfs nfs-utils ;for mount.nfs
openldap openldap
openssl ; needed for SASL openssl ;needed for SASL
; sssd ;; sssd
util-linux)) ; for mount, umount util-linux)) ;for mount, umount
;; XXX A directory index is the closest thing this has to a home page. ;; 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")
@ -91,5 +94,6 @@ 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. ;; fedfs/ is GPL-2-only but not built.
(license (list license:bsd-3 ; modules/cyrus-sasl.c (license (list license:bsd-3 ;modules/cyrus-sasl.c
license:gpl2+)))) ; the rest license:gpl2+))))
; the rest

28
glicid/packages/gcc.scm
View file

@ -1,32 +1,28 @@
(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) ; for make-gcc-toolchain
#:use-module (gnu packages gcc) ;; for gcc-11 #:use-module (gnu packages gcc) ; for gcc-11
) )
;; beware : access to internal functions… this is probably not the right way to do it … ;; beware : access to internal functions… this is probably not the right way to do it …
(define custom-gcc (@@ (gnu packages gcc) custom-gcc) ) (define custom-gcc
(define %generic-search-paths (@@ (gnu packages gcc) %generic-search-paths )) (@@ (gnu packages gcc) custom-gcc))
(define %generic-search-paths
(@@ (gnu packages gcc) %generic-search-paths))
;; ;;
(define-public gfortran-11 (define-public gfortran-11
(hidden-package (hidden-package (custom-gcc gcc-11 "gfortran"
(custom-gcc gcc-11 "gfortran" '("fortran") '("fortran") %generic-search-paths)))
%generic-search-paths
)
)
)
(define-public gfortran-toolchain-11 (define-public gfortran-toolchain-11
(package (package
(inherit (make-gcc-toolchain gfortran-11)) (inherit (make-gcc-toolchain gfortran-11))
(synopsis "Complete GCC tool chain for fortran lang development") (synopsis "Complete GCC tool chain for fortran lang development")
(description "This package provides a complete GCC tool chain for (description
"This package provides a complete GCC tool chain for
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.")))
)
)
)

221
glicid/packages/glicid.scm
View file

@ -4,13 +4,15 @@
#: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 build-system cmake) #:use-module (guix build-system cmake)
; #:use-module (guix licenses) ;; #:use-module (guix licenses)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:use-module ((guix utils) #:select (target-64bit?)) #:prefix license:)
#:use-module ((guix utils)
#:select (target-64bit?))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -87,74 +89,67 @@
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web) #:use-module (gnu packages web)
;; #:use-module (gnu packages glicid) ;; #:use-module (gnu packages glicid)
#:use-module (gnu packages pretty-print) #:use-module (gnu packages pretty-print)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
;; #:use-module (glicid packages storage) ;; #:use-module (glicid packages storage)
#:use-module (glicid packages mpi) #:use-module (glicid packages mpi)
#:use-module (glicid packages gcc) #:use-module (glicid packages gcc)
) )
;;;;;;;; ;;;;;;;;
(define-public glicid-librdkafka-09 (define-public glicid-librdkafka-09
(package (package
(inherit librdkafka) (inherit librdkafka)
(name "glicid-librdkafka-09") (name "glicid-librdkafka-09")
(version "0.9.2") (version "0.9.2")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz")) (uri (string-append
(sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2")) "https://github.com/edenhill/librdkafka/archive/v" version
)) ".tar.gz"))
)) (sha256
(base32
"0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2"))))))
(define-public glicid-x2go (define-public glicid-x2go
(package (package
(name "glicid-x2go") (name "glicid-x2go")
(version "4.1.0.3") (version "4.1.0.3")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7")) "https://code.x2go.org/releases/source/x2goserver/x2goserver-"
)) version ".tar.gz"))
(sha256
(base32
"1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"))))
(native-inputs (native-inputs `(("autoconf" ,autoconf)
`(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(inputs (inputs `(("perl" ,perl)))
`(("perl" , perl)))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "X2go") (synopsis "X2go")
(description "X2go") (description "X2go")
(license license:gpl2+) ;; not checked (license license:gpl2+) ;not checked
(home-page "https://wiki.x2go.org") (home-page "https://wiki.x2go.org")))
)
)
(define-public glicid-gromacs-openmpi (define-public glicid-gromacs-openmpi
(package (package
(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 ;; ("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 `(#:configure-flags (list "-DGMX_DEVELOPER_BUILD=on" ;Needed to run tests
(list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests
;; Unbundling ;; Unbundling
"-DGMX_USE_LMFIT=EXTERNAL" "-DGMX_USE_LMFIT=EXTERNAL"
"-DGMX_BUILD_OWN_FFTW=off" "-DGMX_BUILD_OWN_FFTW=off"
@ -171,22 +166,22 @@
"-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 ;; Workaround for cmake/FindSphinx.cmake version parsing that does
;; not understand the guix-wrapped `sphinx-build --version' answer ;; 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 #:phases (modify-phases %standard-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 ;; Still bundled: part of gromacs, source behind registration
;; but free software anyways ;; but free software anyways
;;(delete-file-recursively "src/external/vmd_molfile") ;; (delete-file-recursively "src/external/vmd_molfile")
;; Still bundled: threads-based OpenMPI-compatible fallback ;; Still bundled: threads-based OpenMPI-compatible fallback
;; designed to be bundled like that ;; designed to be bundled like that
;;(delete-file-recursively "src/external/thread_mpi") ;; (delete-file-recursively "src/external/thread_mpi")
;; Unbundling ;; 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")
@ -203,43 +198,34 @@
"void __guix_disabled()")) "void __guix_disabled()"))
#t))))) #t)))))
) )
) )
(define-public glicid-python-nbxmpp (define-public glicid-python-nbxmpp
(package (package
(inherit python-nbxmpp) (inherit python-nbxmpp)
(name "glicid-python-nbxmpp") (name "glicid-python-nbxmpp")
(version "1.0.2") (version "1.0.2")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "nbxmpp" version)) (uri (pypi-uri "nbxmpp" version))
(sha256 (sha256
(base32 (base32
"0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr")))) "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr"))))
)) ))
(define-public glicid-specific-hdf5 (define-public glicid-specific-hdf5
(package (package
(inherit hdf5-1.12) (inherit hdf5-1.12)
(name "glicid-specific-hdf5") (name "glicid-specific-hdf5")
; (arguments ;; (arguments
; `(#:tests? #f) ;; `(#:tests? #f)
; ) ;; )
(native-inputs `( (native-inputs `(("gcc" ,gcc-11)
("gcc",gcc-11) ("gfortran" ,gfortran-11)
("gfortran",gfortran-11) ,@(package-native-inputs hdf5-1.12)))))
,@(package-native-inputs hdf5-1.12)))
)
)
(define-public glicid-motif (define-public glicid-motif
(package (package
@ -247,36 +233,34 @@
(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 "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/files/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")) (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 ;; #:make-flags
(list (string-append "PREFIX=" %output) (list (string-append "PREFIX=" %output)
; (string-append "CC=" ,(cc-for-target)) ;; (string-append "CC=" ,(cc-for-target))
;; Xft.h #includes <ft2build.h> without ‘freetype2/’. The Makefile ;; Xft.h #includes <ft2build.h> without ‘freetype2/’. The Makefile
;; works around this by hard-coding /usr/include & $PREFIX. ;; works around this by hard-coding /usr/include & $PREFIX.
(string-append "CPPFLAGS=-I" (string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "freetype") (assoc-ref %build-inputs "freetype")
"/include/freetype2") "/include/freetype2")
"V=1") "V=1")))
)
)
(inputs (inputs `(("libxext" ,libxext)
`(("libxext" ,libxext) ("libx11" ,libx11)
("libx11", libx11) ("freetype" ,freetype)
("freetype",freetype) ("libxft" ,libxft)
("libxft",libxft) ("xbitmaps" ,xbitmaps)
("xbitmaps",xbitmaps)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("flex" ,flex) ("flex" ,flex)
("bison" ,bison) ("bison" ,bison)
@ -285,10 +269,9 @@
(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+) ;probably not !!!
) ))
)
(define-public glicid-xmgrace (define-public glicid-xmgrace
(package (package
@ -297,53 +280,42 @@
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/grace.git") (url
"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 (base32 "1wb8v0q8xa2akas0swpgdgw1s66i50k7kh1g2f894hnk91fzx56z")) (sha256
) (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
(lambda _ (lambda _
(substitute* '("Make.conf") (substitute* '("Make.conf")
(("/bin/sh") (which "bash")) (("/bin/sh")
) (which "bash"))))))))
)
)
)
)
)
(inputs (inputs `(("libx11" ,libx11)
`( ("libxft" ,libxft)
("libx11", libx11) ("libxt" ,libxt)
("libxft",libxft) ("libxpm" ,libxpm)
("libxt",libxt)
("libxpm",libxpm)
("libxext" ,libxext) ("libxext" ,libxext)
("autoconf", autoconf) ("autoconf" ,autoconf)
("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) ;; ("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+) ; probably not
) ))
)
(use-modules (guix packages)) (use-modules (guix packages))
(use-modules (guix download)) (use-modules (guix download))
@ -351,14 +323,11 @@
(use-modules (guix build-system ruby)) (use-modules (guix build-system ruby))
;(use-modules (guix licenses)) ;(use-modules (guix licenses))
(define-public ruby-asciidoctor-revealjs (define-public ruby-asciidoctor-revealjs
(package (package
(name "ruby-asciidoctor-revealjs") (name "ruby-asciidoctor-revealjs")
(version "4.1.0") (version "4.1.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "asciidoctor-revealjs" version)) (uri (rubygems-uri "asciidoctor-revealjs" version))
(sha256 (sha256
@ -367,27 +336,23 @@
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs (propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor)
`(("ruby-asciidoctor" ,ruby-asciidoctor) ;; ("ruby-concurrent-ruby" ,ruby-concurrent-ruby)
; ("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 (description
"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.")
(home-page (home-page "https://github.com/asciidoctor/asciidoctor-reveal.js")
"https://github.com/asciidoctor/asciidoctor-reveal.js") (license license:expat)))
(license license:expat))
)
(define-public ruby-asciidoctor-kroki (define-public ruby-asciidoctor-kroki
(package (package
(name "ruby-asciidoctor-kroki") (name "ruby-asciidoctor-kroki")
(version "0.4.0") (version "0.4.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (rubygems-uri "asciidoctor-kroki" version)) (uri (rubygems-uri "asciidoctor-kroki" version))
(sha256 (sha256
@ -396,17 +361,13 @@
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
'(#:tests? #f)) '(#:tests? #f))
(propagated-inputs (propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor)))
`(("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 (description
"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")
(home-page (home-page "https://github.com/Mogztter/asciidoctor-kroki")
"https://github.com/Mogztter/asciidoctor-kroki") (license license:expat)))
(license license:expat)
)
)
;; python-glances is now upstreamed as glances in python-xyz ;; python-glances is now upstreamed as glances in python-xyz

13
glicid/packages/gnome.scm
View file

@ -5,21 +5,14 @@
#:use-module (gnu packages sssd) #:use-module (gnu packages sssd)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (glicid utils) #:use-module (glicid utils)
#:use-module (glicid packages vpn) #:use-module (glicid packages vpn))
)
(define-public glicid-terminator (define-public glicid-terminator
(package (package
(inherit terminator) (inherit terminator)
(name "glicid-terminator") (name "glicid-terminator")
(propagated-inputs (propagated-inputs `(("sssd" ,sssd)
`( ,@(package-propagated-inputs terminator)))))
("sssd" ,sssd)
,@(package-propagated-inputs terminator)
)
)
)
)
;; guix defined version is now on par or newer… ;; guix defined version is now on par or newer…

6
glicid/packages/golang.scm
View file

@ -2,9 +2,9 @@
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:use-module (guix packages) #:prefix license:)
) #:use-module (guix packages))
;(define-public go-github-com-netflix-go-expect-0.0.0-20220104043353-73e0943537d2 ;(define-public go-github-com-netflix-go-expect-0.0.0-20220104043353-73e0943537d2
; (package ; (package

243
glicid/packages/linux.scm
View file

@ -2,15 +2,17 @@
#: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 licenses) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (gnu packages backup) #:use-module (gnu packages backup)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module ((gnu packages linux) #:prefix gnu:) #:use-module ((gnu packages linux)
#:use-module (gnu packages linux) ;; yes : redundant FIXIT #:prefix gnu:)
#:use-module (gnu packages linux) ;yes : redundant FIXIT
#:use-module (gnu system uuid) #:use-module (gnu system uuid)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -22,178 +24,208 @@
(define-public rdma-core-upstream-37.1 (define-public rdma-core-upstream-37.1
(package (package
(inherit gnu:rdma-core) (inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream" )) (name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "37.1") (version "37.1")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz")))))) "https://github.com/linux-rdma/rdma-core/releases/download/v"
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz"))))))
(define-public rdma-core-upstream-38.0 (define-public rdma-core-upstream-38.0
(package (package
(inherit gnu:rdma-core) (inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream" )) (name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "38.0") (version "38.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "043vybwx9kz4mbbmnj0jzkzsw02vzhkkjc5j3yjdiiqkmsgwr3cs")))))) "https://github.com/linux-rdma/rdma-core/releases/download/v"
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"043vybwx9kz4mbbmnj0jzkzsw02vzhkkjc5j3yjdiiqkmsgwr3cs"))))))
(define-public rdma-core-upstream-39.0 (define-public rdma-core-upstream-39.0
(package (package
(inherit gnu:rdma-core) (inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream" )) (name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "39.0") (version "39.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "0y13px3qgyh3szywjhikw183y54iym9sa60aw0sf51p3kzgg1spn")))))) "https://github.com/linux-rdma/rdma-core/releases/download/v"
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"0y13px3qgyh3szywjhikw183y54iym9sa60aw0sf51p3kzgg1spn"))))))
(define-public rdma-core-upstream-41.0 (define-public rdma-core-upstream-41.0
(package (package
(inherit gnu:rdma-core) (inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream" )) (name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "41.0") (version "41.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "0yshfxm9i9fi51mmnxbbv39hqlrc34jzmq6gl2b9f8hzlywdxdz0")))))) "https://github.com/linux-rdma/rdma-core/releases/download/v"
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"0yshfxm9i9fi51mmnxbbv39hqlrc34jzmq6gl2b9f8hzlywdxdz0"))))))
(define-public rdma-core-upstream-42.0 (define-public rdma-core-upstream-42.0
(package (package
(inherit gnu:rdma-core) (inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream" )) (name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "42.0") (version "42.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "03kclikv4k6rpsj6il131jjbnxyvdaiprc3wkmxn471crxsa9f9y")))))) "https://github.com/linux-rdma/rdma-core/releases/download/v"
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"03kclikv4k6rpsj6il131jjbnxyvdaiprc3wkmxn471crxsa9f9y"))))))
(define-public rdma-core-upstream-42.1 (define-public rdma-core-upstream-42.1
(package (package
(inherit gnu:rdma-core) (inherit gnu:rdma-core)
(name (string-append (package-name gnu:rdma-core) "-upstream" )) (name (string-append (package-name gnu:rdma-core) "-upstream"))
(version "42.1") (version "42.1")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp")))))) "https://github.com/linux-rdma/rdma-core/releases/download/v"
version "/rdma-core-" version ".tar.gz"))
(sha256
(base32
"02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp"))))))
(define local-rdma-core
rdma-core-upstream-42.1)
(define local-rdma-core rdma-core-upstream-42.1) (define-public rdma-core-latest
(latest-version local-rdma-core gnu:rdma-core))
(define-public rdma-core-latest (latest-version local-rdma-core gnu:rdma-core))
(define-public libfabric-upstream-1.13.1 (define-public libfabric-upstream-1.13.1
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.13.1") (version "1.13.1")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf")))))) "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf"))))))
(define-public libfabric-upstream-1.14.0 (define-public libfabric-upstream-1.14.0
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.14.0") (version "1.14.0")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw")))))) "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw"))))))
(define-public libfabric-upstream-1.14.1 (define-public libfabric-upstream-1.14.1
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.14.1") (version "1.14.1")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "1vca7p5cczlrayglps8ibdy0fz9nb9pm04jj07cikr58pjabpykc")))))) "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"1vca7p5cczlrayglps8ibdy0fz9nb9pm04jj07cikr58pjabpykc"))))))
(define-public libfabric-upstream-1.15.0 (define-public libfabric-upstream-1.15.0
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.15.0") (version "1.15.0")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "1slvgih7y7mb30mvnvxm31k202z48pb3yh98vcfmpsyyx9c2r63h")))))) "https://github.com/ofiwg/libfabric/releases/download/v"
version "/libfabric-" version ".tar.bz2"))
(sha256
(base32
"1slvgih7y7mb30mvnvxm31k202z48pb3yh98vcfmpsyyx9c2r63h"))))))
(define-public libfabric-upstream-1.15.1 (define-public libfabric-upstream-1.15.1
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.15.1") (version "1.15.1")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna")) "https://github.com/ofiwg/libfabric/releases/download/v"
) version "/libfabric-" version ".tar.bz2"))
) (sha256
(inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h (base32
("numactl", gnu:numactl) "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna"))))
(inputs `(("util-linux:lib" ,util-linux "lib")
;; uuid.h, numa.h
("numactl" ,gnu:numactl)
,@(package-inputs gnu:libfabric))))) ,@(package-inputs gnu:libfabric)))))
(define-public libfabric-upstream-1.16.0 (define-public libfabric-upstream-1.16.0
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.16.0") (version "1.16.0")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c")) "https://github.com/ofiwg/libfabric/releases/download/v"
) version "/libfabric-" version ".tar.bz2"))
) (sha256
(inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h (base32
("numactl", gnu:numactl) "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c"))))
(inputs `(("util-linux:lib" ,util-linux "lib")
;; uuid.h, numa.h
("numactl" ,gnu:numactl)
,@(package-inputs gnu:libfabric))))) ,@(package-inputs gnu:libfabric)))))
(define-public libfabric-upstream-1.16.1 (define-public libfabric-upstream-1.16.1
(package (package
(inherit gnu:libfabric) (inherit gnu:libfabric)
(version "1.16.1") (version "1.16.1")
(name (string-append (package-name gnu:libfabric) "-upstream" )) (name (string-append (package-name gnu:libfabric) "-upstream"))
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")) "https://github.com/ofiwg/libfabric/releases/download/v"
) version "/libfabric-" version ".tar.bz2"))
) (sha256
(inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h (base32
("numactl", gnu:numactl) "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak"))))
(inputs `(("util-linux:lib" ,util-linux "lib")
;; uuid.h, numa.h
("numactl" ,gnu:numactl)
,@(package-inputs gnu:libfabric))))) ,@(package-inputs gnu:libfabric)))))
(define local-libfabric
libfabric-upstream-1.16.1)
(define-public libfabric-latest
(latest-version local-libfabric gnu:libfabric))
(define local-libfabric libfabric-upstream-1.16.1)
(define-public libfabric-latest (latest-version local-libfabric gnu:libfabric))
(define-public psm2-upstream-11.2.228 (define-public psm2-upstream-11.2.228
(package (package
@ -206,7 +238,9 @@
(url "https://github.com/cornelisnetworks/opa-psm2") (url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version)))) (commit (string-append "PSM2_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz")))))) (sha256
(base32
"1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz"))))))
(define-public psm2-upstream-11.2.230 (define-public psm2-upstream-11.2.230
(package (package
@ -219,24 +253,27 @@
(url "https://github.com/cornelisnetworks/opa-psm2") (url "https://github.com/cornelisnetworks/opa-psm2")
(commit (string-append "PSM2_" version)))) (commit (string-append "PSM2_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl")))))) (sha256
(base32
"1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl"))))))
(define local-psm2
psm2-upstream-11.2.230)
(define-public psm2-latest
(define local-psm2 psm2-upstream-11.2.230) (latest-version local-psm2 gnu:psm2))
(define-public psm2-latest (latest-version local-psm2 gnu:psm2))
(define-public corefreq (define-public corefreq
(package (package
(inherit gnu:corefreq) (inherit gnu:corefreq)
(name "corefreq") (name "corefreq")
(version "1.93.1") (version "1.93.1")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cyring/CoreFreq") (url "https://github.com/cyring/CoreFreq")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1crp1cmfcfd26j8rg29pl3lbkp135f17jr1686y0cb87v133kcq8")))))) (sha256
(base32
"1crp1cmfcfd26j8rg29pl3lbkp135f17jr1686y0cb87v133kcq8"))))))

63
glicid/packages/maths.scm
View file

@ -1,65 +1,58 @@
(define-module (glicid packages maths) (define-module (glicid packages maths)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((gnu packages maths) #:prefix gnu:) #:use-module ((gnu packages maths)
#:prefix gnu:)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (gnu packages mpi) #: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)
#:use-module (glicid utils) #:use-module (glicid utils))
)
(define-public scalapack-upstream (define-public scalapack-upstream
(package (package
(inherit gnu:scalapack) (inherit gnu:scalapack)
(name "scalapack-upstream") (name "scalapack-upstream")
(version "2.1.0-new-upstream") (version "2.1.0-new-upstream")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (uri (git-reference
(git-reference (url
(url "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")) ;; (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 scalapack-upstream) (define local:scalapack
(define-public scalapack-latest (latest-version local:scalapack gnu:scalapack)) scalapack-upstream)
(define-public scalapack-latest
(latest-version local:scalapack gnu:scalapack))
(define-public openblas-upstream-0.3.15 (define-public openblas-upstream-0.3.15
(package (package
(inherit gnu:openblas) (inherit gnu:openblas)
(name "openblas-upstream") (name "openblas-upstream")
(version "0.3.15") (version "0.3.15")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz" )) (uri (string-append
(sha256 (base32 "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")) "https://github.com/xianyi/OpenBLAS/releases/download/v"
) version "/OpenBLAS-" version ".tar.gz"))
) (sha256
) (base32
) "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h"))))))
(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))

83
glicid/packages/mpi.scm
View file

@ -1,70 +1,59 @@
(define-module (glicid packages mpi) (define-module (glicid packages mpi)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module ((gnu packages mpi) #:prefix gnu:) #:use-module ((gnu packages mpi)
#:prefix gnu:)
#:use-module (glicid packages linux) #:use-module (glicid packages linux)
#:use-module (glicid packages fabric-management) #: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-upstream-4.1.2 (define-public openmpi-upstream-4.1.2
(package (package
(inherit gnu:openmpi) (inherit gnu:openmpi)
(name "openmpi-upstream") (name "openmpi-upstream")
(version "4.1.2") (version "4.1.2")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v" (uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version) (version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2")) "/downloads/openmpi-" version ".tar.bz2"))
(sha256 (base32 "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v")) (sha256
(patches (search-patches "openmpi-mtl-priorities.patch")) (base32
) "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v"))
) (patches (search-patches "openmpi-mtl-priorities.patch"))))))
)
)
(define-public openmpi-upstream-4.1.4 (define-public openmpi-upstream-4.1.4
(package (package
(inherit gnu:openmpi) (inherit gnu:openmpi)
(name "openmpi-upstream") (name "openmpi-upstream")
(version "4.1.4") (version "4.1.4")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.open-mpi.org/software/ompi/v" (uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version) (version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2")) "/downloads/openmpi-" version ".tar.bz2"))
(sha256 (base32 "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) (sha256
(patches (search-patches "openmpi-mtl-priorities.patch")) (base32
) "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj"))
) (patches (search-patches "openmpi-mtl-priorities.patch"))))))
)
)
(define local-openmpi
openmpi-upstream-4.1.4)
(define-public openmpi-latest
(latest-version local-openmpi gnu:openmpi))
(define local-openmpi openmpi-upstream-4.1.4)
(define-public openmpi-latest (latest-version local-openmpi gnu:openmpi))
(define-public openmpi-glicid (define-public openmpi-glicid
(package (package
(inherit (inherit (transform-package ((instead-of "slurm" slurm-glicid)
(transform-package ((instead-of "slurm" slurm-glicid) openmpi-latest) "glicid") openmpi-latest) "glicid"))))
)
)
)
(define openmpi-glicid-libfabric (define openmpi-glicid-libfabric
(transform-package ((instead-of "libfabric" libfabric-latest) openmpi-glicid) "libfabric") (transform-package ((instead-of "libfabric" libfabric-latest)
) openmpi-glicid) "libfabric"))
;(define-public openmpi-glicid-rdma ;(define-public openmpi-glicid-rdma
; (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core") ; (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core")
@ -75,35 +64,33 @@
;) ;)
(define openmpi-glicid-libfabric-rdma (define openmpi-glicid-libfabric-rdma
(transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid-libfabric) "rdma") (transform-package ((instead-of "rdma-core" rdma-core-latest)
) openmpi-glicid-libfabric) "rdma"))
;(define-public openmpi-glicid-libfabric-ucx ;(define-public openmpi-glicid-libfabric-ucx
; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx") ; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "ucx")
;) ;)
(define openmpi-glicid-libfabric-rdma-ucx (define openmpi-glicid-libfabric-rdma-ucx
(transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric-rdma) "ucx") (transform-package ((instead-of "ucx" ucx-latest-glicid)
) openmpi-glicid-libfabric-rdma) "ucx"))
(define openmpi-glicid-libfabric-rdma-ucx-psm2 (define openmpi-glicid-libfabric-rdma-ucx-psm2
(transform-package ((instead-of "psm2" psm2-latest) openmpi-glicid-libfabric-rdma-ucx) "psm2") (transform-package ((instead-of "psm2" psm2-latest)
) openmpi-glicid-libfabric-rdma-ucx) "psm2"))
(define-public openmpi-glicid-waves (define-public openmpi-glicid-waves
(package (package
(inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl) openmpi-glicid-libfabric-rdma-ucx-psm2) "waves")) (inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl)
(name "openmpi-glicid-waves") openmpi-glicid-libfabric-rdma-ucx-psm2)
) "waves"))
) (name "openmpi-glicid-waves")))
(define openmpi-glicid-transform-gcc-11
(define openmpi-glicid-transform-gcc-11 (gcc11-instead-of-gcc openmpi-glicid)) (gcc11-instead-of-gcc openmpi-glicid))
(define-public openmpi-glicid-gcc-11 (define-public openmpi-glicid-gcc-11
(package (package
(inherit openmpi-glicid-transform-gcc-11) (inherit openmpi-glicid-transform-gcc-11)
(name (string-append (package-name openmpi-glicid-transform-gcc-11) "-gcc-11" )) (name (string-append (package-name openmpi-glicid-transform-gcc-11)
) "-gcc-11"))))
)

107
glicid/packages/networking.scm
View file

@ -1,93 +1,88 @@
(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 (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)
#:use-module (guix packages) #:prefix license:)
) #:use-module (guix packages))
(define-public libecap (define-public libecap
(package (package
(name "libecap") (name "libecap")
(version "1.0.0") (version "1.0.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.e-cap.org/archive/libecap-" version ".tar.gz")) (uri (string-append "https://www.e-cap.org/archive/libecap-"
(sha256 (base32 "1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4")) version ".tar.gz"))
) (sha256
) (base32
"1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module.") (synopsis
(description "eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module.") "eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module.")
(description
"eCAP is a software interface that allows a network application, such as an HTTP proxy or an ICAP server, to outsource content analysis and adaptation to a loadable module.")
(home-page "https://www.e-cap.org/") (home-page "https://www.e-cap.org/")
(license license:gpl3+) (license license:gpl3+)))
)
)
(define-public squid (define-public squid
(package (package
(inherit gnu:squid) (inherit gnu:squid)
(name "squid") (name "squid")
(version "5.7") (version "5.7")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz")) (uri (string-append
(sha256 (base32 "10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb")) "http://www.squid-cache.org/Versions/v5/squid-" version
) ".tar.xz"))
) (sha256
(inputs (base32
`(("libecap", libecap) "10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb"))))
(inputs `(("libecap" ,libecap)
,@(package-inputs gnu:squid))) ,@(package-inputs gnu:squid)))
(arguments (arguments
'( '(#:configure-flags (list "--disable-arch-native"
#:configure-flags (list "--enable-icmp"
"--disable-arch-native" "--enable-icmp" "--enable-delay-pools" "--enable-ecap" "--enable-follow-x-forwarded-for" "--enable-delay-pools"
"--enable-auth" "--enable-auth-basic" "--enable-auth-negotiate" "--enable-auth-ntlm" "--enable-ecap"
"--enable-log-daemon-helpers" "--enable-follow-x-forwarded-for"
) "--enable-auth"
#:phases "--enable-auth-basic"
(modify-phases %standard-phases "--enable-auth-negotiate"
"--enable-auth-ntlm"
"--enable-log-daemon-helpers")
#:phases (modify-phases %standard-phases
(add-before 'build 'fix-true-path (add-before 'build 'fix-true-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "test-suite/testheaders.sh" (substitute* "test-suite/testheaders.sh"
(("/bin/true") (search-input-file inputs "/bin/true")) (("/bin/true")
) (search-input-file inputs "/bin/true"))))))))))
)
)
)
)
)
)
)
(define-public squid-5.5 (define-public squid-5.5
(package (package
(inherit squid) (inherit squid)
(name "squid") (name "squid")
(version "5.5") (version "5.5")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz")) (uri (string-append
(sha256 (base32 "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af")) "http://www.squid-cache.org/Versions/v5/squid-" version
) ".tar.xz"))
) (sha256
) (base32
) "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af"))))))
(define-public openvswitch-2.17 (define-public openvswitch-2.17
(package (package
(inherit gnu:openvswitch) (inherit gnu:openvswitch)
(name "openvswitch") (name "openvswitch")
(version "2.17.2") (version "2.17.2")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.openvswitch.org/releases/openvswitch-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "0sada2a9x9x7x6a45l7iklqh29wsbrdvvgpkyz5cpf5d5fs0sbka")) "https://www.openvswitch.org/releases/openvswitch-"
) version ".tar.gz"))
) (sha256
) (base32
) "0sada2a9x9x7x6a45l7iklqh29wsbrdvvgpkyz5cpf5d5fs0sbka"))))))

78
glicid/packages/nfs.scm
View file

@ -4,7 +4,8 @@
#: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 build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -19,59 +20,48 @@
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages jemalloc) #:use-module (gnu packages jemalloc)
#:use-module (gnu packages storage) #:use-module (gnu packages storage)
; #:use-module (glicid packages storage) ;; #:use-module (glicid packages storage)
) )
(define-public nfs-ganesha (define-public nfs-ganesha
(package (package
(name "nfs-ganesha") (name "nfs-ganesha")
(version "3.5") (version "3.5")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (uri (git-reference
(git-reference
(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
) (base32
(sha256 (base32 "0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4")) "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 `(#:configure-flags (list (string-append "-DLIB_INSTALL_DIR="
(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 _ (chdir "src") (lambda _
#t (chdir "src") #t)))))
)) (inputs `(("perl" ,perl)
) ("oksh" ,oksh)
)) ("python-3" ,python-3)
(inputs `( ("mit-krb5" ,mit-krb5)
("perl", perl) ("gss" ,gss)
("oksh", oksh) ("pkg-config" ,pkg-config)
("python-3", python-3) ("jemalloc" ,jemalloc)
("mit-krb5", mit-krb5) ("ceph:lib" ,ceph "lib")
("gss", gss) ("libnfsidmap" ,libnfsidmap)
("pkg-config", pkg-config) ("libnfs" ,libnfs)
("jemalloc", jemalloc) ("liburcu" ,liburcu)
("ceph:lib", ceph "lib") ("bison" ,bison)
("libnfsidmap", libnfsidmap) ("flex" ,flex)
("libnfs", libnfs) ("libnsl" ,libnsl)
("liburcu", liburcu) ("util-linux" ,util-linux "lib")))
("bison", bison)
("flex", flex)
("libnsl", libnsl)
("util-linux", util-linux "lib")
))
(synopsis "nfs-ganesha") (synopsis "nfs-ganesha")
(description "NFS-Ganesha.") (description "NFS-Ganesha.")
(home-page "https://") (home-page "https://")
(license license:gpl3+) (license license:gpl3+)))
)
)

263
glicid/packages/nginx.scm
View file

@ -4,7 +4,8 @@
#: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) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
@ -23,25 +24,28 @@
(version "1.23.2") (version "1.23.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (uri (string-append "https://nginx.org/download/nginx-" version
(sha256 (base32 "0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358")))) ".tar.gz"))
(sha256
(base32
"0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list libxml2 libxslt openssl pcre zlib)) (inputs (list libxml2 libxslt openssl pcre zlib))
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases (modify-phases %standard-phases
(modify-phases
%standard-phases
(add-before 'configure 'patch-/bin/sh (add-before 'configure 'patch-/bin/sh
(lambda _ (lambda _
(substitute* "auto/feature" (substitute* "auto/feature"
(("/bin/sh") (which "sh"))) (("/bin/sh")
#t)) (which "sh"))) #t))
(replace 'configure (replace 'configure
;; The configure script is hand-written, not from GNU autotools. ;; The configure script is hand-written, not from GNU autotools.
(lambda* (#:key configure-flags inputs outputs #:allow-other-keys) (lambda* (#:key configure-flags inputs outputs
(let ((flags #:allow-other-keys)
(append (list (string-append "--prefix=" (assoc-ref outputs "out")) (let ((flags (append (list (string-append "--prefix="
(assoc-ref
outputs "out"))
"--with-http_ssl_module" "--with-http_ssl_module"
"--with-http_v2_module" "--with-http_v2_module"
"--with-http_xslt_module" "--with-http_xslt_module"
@ -55,31 +59,40 @@
;; Even when not cross-building, we pass the ;; Even when not cross-building, we pass the
;; --crossbuild option to avoid customizing for the ;; --crossbuild option to avoid customizing for the
;; kernel version on the build machine. ;; kernel version on the build machine.
,(let ((system "Linux") ; uname -s ,(let ((system "Linux")
(release "3.2.0") ; uname -r ;uname -s
(release "3.2.0") ;uname -r
;; uname -m ;; uname -m
(machine (match (or (%current-target-system) (machine (match (or (%current-target-system)
(%current-system)) (%current-system))
("x86_64-linux" "x86_64") ("x86_64-linux"
("i686-linux" "i686") "x86_64")
("mips64el-linux" "mips64") ("i686-linux"
"i686")
("mips64el-linux"
"mips64")
(_ "UNSUPPORTED")))) (_ "UNSUPPORTED"))))
(string-append "--crossbuild=" system ":" release ":" machine) (string-append "--crossbuild="
)) system
":"
release
":"
machine)))
configure-flags))) configure-flags)))
(setenv "CC" ,(cc-for-target)) (setenv "CC"
(setenv "CFLAGS" ; CPPFLAGS is not respected ,(cc-for-target))
(string-append "-I" (assoc-ref inputs "libxml2") (setenv "CFLAGS" ;CPPFLAGS is not respected
(string-append "-I"
(assoc-ref inputs "libxml2")
"/include/libxml2")) "/include/libxml2"))
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
(apply invoke "./configure" flags) (apply invoke "./configure" flags) #t)))
#t)))
(add-after 'install 'install-man-page (add-after 'install 'install-man-page
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man"))) (man (string-append out "/share/man")))
(install-file "objs/nginx.8" (string-append man "/man8")) (install-file "objs/nginx.8"
#t))) (string-append man "/man8")) #t)))
(add-after 'install 'fix-root-dirs (add-after 'install 'fix-root-dirs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -89,8 +102,7 @@
(rename-file (string-append out "/conf") (rename-file (string-append out "/conf")
(string-append share "/conf")) (string-append share "/conf"))
(rename-file (string-append out "/html") (rename-file (string-append out "/html")
(string-append share "/html")) (string-append share "/html")) #t))))))
#t))))))
(home-page "https://nginx.org") (home-page "https://nginx.org")
(synopsis "HTTP and reverse proxy server") (synopsis "HTTP and reverse proxy server")
(description (description
@ -99,45 +111,47 @@
and as a proxy to reduce the load on back-end HTTP or mail servers.") and as a proxy to reduce the load on back-end HTTP or mail servers.")
(license (list license:bsd-2 license:expat license:bsd-3 license:bsd-4)))) (license (list license:bsd-2 license:expat license:bsd-3 license:bsd-4))))
(define-public nginx-ldap-auth-module (define-public nginx-ldap-auth-module
(package (package
(inherit nginx) (inherit nginx)
(name "nginx-ldap-auth-module") (name "nginx-ldap-auth-module")
(version "83c059b73566c2ee9cbda920d91b66657cf120b7") (version "83c059b73566c2ee9cbda920d91b66657cf120b7")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/kvspb/nginx-auth-ldap") (url "https://github.com/kvspb/nginx-auth-ldap")
(commit version))) (commit version)))
(file-name (git-file-name "nginx-ldap-auth-module" version)) (file-name (git-file-name "nginx-ldap-auth-module" version))
(sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s")))) (sha256
(base32
"023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s"))))
(synopsis "LDAP Authentication module for nginx") (synopsis "LDAP Authentication module for nginx")
(description "LDAP module for nginx which supports authentication against multiple LDAP servers.") (description
"LDAP module for nginx which supports authentication against multiple LDAP servers.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs `(("nginx-sources" ,(package-source nginx))
`(("nginx-sources" ,(package-source nginx)) ("openldap" ,openldap)
("openldap", openldap)
,@(package-inputs nginx))) ,@(package-inputs nginx)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.")
`(#:configure-flags '("--add-dynamic-module=.") #:make-flags '("modules")
#:make-flags '("modules") ,@(package-arguments nginx)) ,@(package-arguments nginx))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(begin (begin
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar"))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")) (nginx-srcs (assoc-ref inputs "nginx-sources")))
#t ))) (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs
"--strip-components=1")) #t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out")
"/etc/nginx/modules")))
(install-file "objs/ngx_http_auth_ldap_module.so" modules-dir) (install-file "objs/ngx_http_auth_ldap_module.so" modules-dir)
#t ))) #t)))
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page))))))) (delete 'install-man-page)))))))
@ -145,63 +159,63 @@
(package (package
(name "modsecurity") (name "modsecurity")
(version "3.0.8") (version "3.0.8")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") "https://github.com/SpiderLabs/ModSecurity/releases/download/v"
)) version "/modsecurity-v" version ".tar.gz")))
(sha256 (base32 "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2")))) (sha256
(base32
"1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2"))))
(synopsis "modsecurity module for nginx") (synopsis "modsecurity module for nginx")
(description "modsecurity module for nginx.") (description "modsecurity module for nginx.")
(license license:asl2.0) (license license:asl2.0)
(home-page "https://github.com/SpiderLabs/ModSecurity") (home-page "https://github.com/SpiderLabs/ModSecurity")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `( (inputs `(("curl" ,curl)
("curl", curl) ("libxml2" ,libxml2)
("libxml2", libxml2) ("libxslt" ,libxslt)
("libxslt", libxslt) ("openssl" ,openssl)
("openssl", openssl) ("pcre" ,pcre)
("pcre", pcre) ("pcre:bin" ,pcre "bin")
("pcre:bin", pcre "bin") ("zlib" ,zlib)
("zlib", zlib) ("pkg-config" ,pkg-config)
("pkg-config", pkg-config) ("nginx-sources" ,(package-source nginx))))
("nginx-sources", (package-source nginx))
))
(arguments (arguments
`( #:configure-flags (list `(#:configure-flags (list (string-append "--with-curl="
(string-append "--with-curl=" (assoc-ref %build-inputs "curl")) (assoc-ref %build-inputs "curl"))
(string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config") (string-append "--with-pcre="
(string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2")) (assoc-ref %build-inputs
"--enable-standalone-module" ))))) "pcre:bin")
"/bin/pcre-config")
(string-append "--with-libxml="
(assoc-ref %build-inputs
"libxml2"))
"--enable-standalone-module")))))
(define-public nginx-modsecurity-module (define-public nginx-modsecurity-module
(package (package
(inherit nginx) (inherit nginx)
(name "nginx-modsecurity-module") (name "nginx-modsecurity-module")
(version "1.0.3") (version "1.0.3")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz") "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v"
)) version "/modsecurity-nginx-v" version ".tar.gz")))
(sha256 (base32 "1pcayz0kkpr0fvs8fwai0xv7jw9r7ph66vwxm6vrq0mc11r1r0df")) (sha256
) (base32
) "1pcayz0kkpr0fvs8fwai0xv7jw9r7ph66vwxm6vrq0mc11r1r0df"))))
(synopsis "ModSecurity module for nginx") (synopsis "ModSecurity module for nginx")
(description "ModSecurity module for nginx.") (description "ModSecurity module for nginx.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs `(("nginx-sources" ,(package-source nginx))
`(("nginx-sources" ,(package-source nginx)) ("modsecurity" ,modsecurity)
("modsecurity", modsecurity)
,@(package-inputs nginx))) ,@(package-inputs nginx)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.")
`(#:configure-flags '("--add-dynamic-module=.")
#:make-flags '("modules") #:make-flags '("modules")
,@(package-arguments nginx) ,@(package-arguments nginx))
)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
@ -209,15 +223,16 @@
(begin (begin
;; The nginx source code is part of the module’s source. ;; The nginx source code is part of the module’s source.
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar"))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (nginx-srcs (assoc-ref inputs "nginx-sources")))
) (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs
#t ))) "--strip-components=1")) #t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out")
(install-file "objs/ngx_http_modsecurity_module.so" modules-dir) "/etc/nginx/modules")))
#t ))) (install-file "objs/ngx_http_modsecurity_module.so"
modules-dir) #t)))
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page))))))) (delete 'install-man-page)))))))
@ -226,24 +241,24 @@
(inherit nginx) (inherit nginx)
(name "nginx-geoip2-module") (name "nginx-geoip2-module")
(version "3.4") (version "3.4")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" version ".tar.gz") "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/"
)) version ".tar.gz")))
(sha256 (base32 "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd")))) (sha256
(base32
"0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd"))))
(synopsis "GeoIP2 module for nginx") (synopsis "GeoIP2 module for nginx")
(description "GeoIP2 module for nginx.") (description "GeoIP2 module for nginx.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs `(("nginx-sources" ,(package-source nginx))
`(("nginx-sources" ,(package-source nginx)) ("libmaxminddb" ,libmaxminddb)
("libmaxminddb", libmaxminddb)
,@(package-inputs nginx))) ,@(package-inputs nginx)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.")
`(#:configure-flags '("--add-dynamic-module=.") #:make-flags '("modules")
#:make-flags '("modules") ,@(package-arguments nginx)) ,@(package-arguments nginx))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
@ -251,16 +266,17 @@
(begin (begin
;; The nginx source code is part of the module’s source. ;; The nginx source code is part of the module’s source.
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar"))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (nginx-srcs (assoc-ref inputs "nginx-sources")))
) (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs
#t ))) "--strip-components=1")) #t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out")
"/etc/nginx/modules")))
(install-file "objs/ngx_http_geoip2_module.so" modules-dir) (install-file "objs/ngx_http_geoip2_module.so" modules-dir)
(install-file "objs/ngx_stream_geoip2_module.so" modules-dir) (install-file "objs/ngx_stream_geoip2_module.so" modules-dir)
#t ))) #t)))
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page))))))) (delete 'install-man-page)))))))
@ -269,23 +285,23 @@
(inherit nginx) (inherit nginx)
(name "nginx-http_subs_filter-module") (name "nginx-http_subs_filter-module")
(version "e12e965") (version "e12e965")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (list (uri (list (string-append
(string-append "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" version ".tar.gz") "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/"
)) version ".tar.gz")))
(sha256 (base32 "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans")))) (sha256
(base32
"1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans"))))
(synopsis "substitutions_filter module for nginx") (synopsis "substitutions_filter module for nginx")
(description "substitutions_filter module for nginx.") (description "substitutions_filter module for nginx.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs `(("nginx-sources" ,(package-source nginx))
`(("nginx-sources" ,(package-source nginx))
,@(package-inputs nginx))) ,@(package-inputs nginx)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.")
`(#:configure-flags '("--add-dynamic-module=.") #:make-flags '("modules")
#:make-flags '("modules") ,@(package-arguments nginx)) ,@(package-arguments nginx))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'unpack-nginx-sources (add-after 'unpack 'unpack-nginx-sources
@ -293,14 +309,15 @@
(begin (begin
;; The nginx source code is part of the module’s source. ;; The nginx source code is part of the module’s source.
(format #t "decompressing nginx source code~%") (format #t "decompressing nginx source code~%")
(let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) (let ((tar (assoc-ref inputs "tar"))
(invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") (nginx-srcs (assoc-ref inputs "nginx-sources")))
) (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs
#t ))) "--strip-components=1")) #t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) (let ((modules-dir (string-append (assoc-ref outputs "out")
(install-file "objs/ngx_http_subs_filter_module.so" modules-dir) "/etc/nginx/modules")))
#t ))) (install-file "objs/ngx_http_subs_filter_module.so"
modules-dir) #t)))
(delete 'fix-root-dirs) (delete 'fix-root-dirs)
(delete 'install-man-page))))))) (delete 'install-man-page)))))))

95
glicid/packages/openldap.scm
View file

@ -1,7 +1,8 @@
(define-module (glicid packages openldap) (define-module (glicid packages openldap)
#: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:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -14,7 +15,8 @@
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module ((gnu packages openldap) #:prefix gnu:) #:use-module ((gnu packages openldap)
#:prefix gnu:)
#:use-module (gnu packages password-utils) #:use-module (gnu packages password-utils)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -27,17 +29,30 @@
(version "2.6.3") (version "2.6.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) (uri (list (string-append
(sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj")))) "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-"
version ".tgz")))
(sha256
(base32
"0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list argon2 cyrus-sasl libevent libgcrypt libltdl lz4 openssl perl snappy unixodbc wiredtiger zlib)) (inputs (list argon2
cyrus-sasl
libevent
libgcrypt
libltdl
lz4
openssl
perl
snappy
unixodbc
wiredtiger
zlib))
(native-inputs (list bdb groff libtool pkg-config)) (native-inputs (list bdb groff libtool pkg-config))
(arguments '( (arguments
; this is needed because the make check does not work inside guix '(;; this is needed because the make check does not work inside guix
#:tests? #f #:tests? #f
#:configure-flags '( #:configure-flags '("--enable-debug" "--enable-dynamic"
"--enable-debug"
"--enable-dynamic"
"--enable-syslog" "--enable-syslog"
"--enable-ipv6" "--enable-ipv6"
"--enable-local" "--enable-local"
@ -56,15 +71,15 @@
"--enable-balancer" "--enable-balancer"
"--disable-static" "--disable-static"
"--enable-shared" "--enable-shared"
"--with-tls=openssl" "--with-tls=openssl")
)
#:make-flags '("STRIP=") #:make-flags '("STRIP=")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'build 'make-depend (add-before 'build 'make-depend
(lambda* (#:key input #:allow-other-keys) (lambda* (#:key input #:allow-other-keys)
(invoke "make" "depend")))))) (invoke "make" "depend"))))))
(synopsis "Implementation of the Lightweight Directory Access Protocol") (synopsis "Implementation of the Lightweight Directory Access Protocol")
(description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") (description
"OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")
(license license:openldap2.8) (license license:openldap2.8)
(home-page "https://www.openldap.org/"))) (home-page "https://www.openldap.org/")))
@ -75,8 +90,12 @@
(version "2.4.59") (version "2.4.59")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) (uri (list (string-append
(sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr")))))) "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-"
version ".tgz")))
(sha256
(base32
"0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr"))))))
(define-public openldap-2.5.13 (define-public openldap-2.5.13
(package (package
@ -85,8 +104,12 @@
(version "2.5.13") (version "2.5.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) (uri (list (string-append
(sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f")))))) "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-"
version ".tgz")))
(sha256
(base32
"13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f"))))))
(define-public nss-pam-ldapd (define-public nss-pam-ldapd
(package (package
@ -94,31 +117,33 @@
(version "0.9.12") (version "0.9.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6")))) "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-"
version ".tar.gz"))
(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 (assoc-ref %outputs "out")
(list (string-append "/lib/security/")
"--with-pam-seclib-dir=" (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
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile.in" (substitute* "Makefile.in"
( (("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)")
("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)") (string-append (assoc-ref outputs "out")
(string-append (assoc-ref outputs "out") "/etc/nslcd.conf.example")))))))) "/etc/nslcd.conf.example"))))))))
(inputs `( (inputs `(("linux-pam" ,linux-pam)
("linux-pam", linux-pam) ("mit-krb5" ,mit-krb5)
("mit-krb5", mit-krb5) ("openldap" ,openldap)
("openldap", openldap) ("python" ,python)))
("python", python)))
(home-page "https://arthurdejong.org/nss-pam-ldapd") (home-page "https://arthurdejong.org/nss-pam-ldapd")
(synopsis "NSS and PAM modules for LDAP") (synopsis "NSS and PAM modules for LDAP")
(description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS) (description
"nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
module that allows your LDAP server to provide user account, group, host name, module that allows your LDAP server to provide user account, group, host name,
alias, netgroup, and basically any other information that you would normally alias, netgroup, and basically any other information that you would normally
get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable get from @file{/etc} flat files or NIS. It also provides a @dfn{Pluggable

233
glicid/packages/parallel.scm
View file

@ -3,7 +3,8 @@
#: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 gnu)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (gnu packages parallel) #:use-module (gnu packages parallel)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
@ -14,241 +15,195 @@
#: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 (glicid packages fabric-management) ;for latest ucx
#:use-module (glicid packages containers) ; for latest podman #:use-module (glicid packages containers) ;for latest podman
#:use-module (gnu packages compression) ; lz4 #:use-module (gnu packages compression) ;lz4
#:use-module (gnu packages lua) ; lua #:use-module (gnu packages lua) ;lua
) )
(define-public openpmix-3.1.5 (define-public openpmix-3.1.5
(package (package
(name "openpmix") (name "openpmix")
(version "3.1.5") (version "3.1.5")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openpmix/openpmix/releases/download/v" version "/pmix-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8")) "https://github.com/openpmix/openpmix/releases/download/v"
) version "/pmix-" version ".tar.bz2"))
) (sha256
(base32
"1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags (list (string-append "--with-hwloc="
(list (assoc-ref %build-inputs "hwloc")))))
(string-append "--with-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/")
(license license:gpl3+) (license license:gpl3+)
(inputs `( (inputs `(("libevent" ,libevent)
("libevent", libevent)
("hwloc" ,hwloc-2 "lib") ("hwloc" ,hwloc-2 "lib")
("perl", perl) ("perl" ,perl)))))
))
)
)
(define-public openpmix-4.1.0 (define-public openpmix-4.1.0
(package (package
(inherit openpmix-3.1.5) (inherit openpmix-3.1.5)
(version "4.1.0") (version "4.1.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/openpmix/openpmix/releases/download/v" version "/pmix-" version ".tar.bz2")) (uri (string-append
(sha256 (base32 "0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql")) "https://github.com/openpmix/openpmix/releases/download/v"
) version "/pmix-" version ".tar.bz2"))
) (sha256
(inputs `( (base32
("python", python) "0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql"))))
("zlib", zlib) (inputs `(("python" ,python)
("pandoc", pandoc) ("zlib" ,zlib)
,@(package-inputs openpmix-3.1.5) ("pandoc" ,pandoc)
)) ,@(package-inputs openpmix-3.1.5)))))
)
)
(define-public openpmix openpmix-4.1.0) (define-public openpmix
openpmix-4.1.0)
(define-public slurm-20.02-upstream (define-public slurm-20.02-upstream
(package (package
(inherit slurm-20.02) (inherit slurm-20.02)
(name "slurm-upstream") (name "slurm-upstream")
(version "20.02.7") (version "20.02.7")
(source (source (origin
(origin
(inherit (package-source slurm-20.02)) (inherit (package-source slurm-20.02))
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-"
(sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) version ".tar.bz2"))
) (sha256
) (base32
) "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6"))))))
)
(define slurm-20.02-latest (define slurm-20.02-latest
(latest-version slurm-20.02 slurm-20.02-upstream) (latest-version slurm-20.02 slurm-20.02-upstream))
)
(define-public slurm-20.02-glicid (define-public slurm-20.02-glicid
(package (package
(inherit slurm-20.02-latest) (inherit slurm-20.02-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `( (inputs `(("gtk+-2" ,gtk+-2)
("gtk+-2", gtk+-2) ("mariadb:dev" ,mariadb "dev")
("mariadb:dev", mariadb "dev") ,@(package-inputs slurm-20.02-latest)))))
,@(package-inputs slurm-20.02-latest)
))
)
)
(define-public slurm-20.11-upstream (define-public slurm-20.11-upstream
(package (package
(inherit slurm-20.11) (inherit slurm-20.11)
(name "slurm-upstream") (name "slurm-upstream")
(version "20.11.9") (version "20.11.9")
(source (source (origin
(origin
(inherit (package-source slurm-20.11)) (inherit (package-source slurm-20.11))
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-"
(sha256 (base32 "0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m")) version ".tar.bz2"))
(sha256
(base32
"0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m"))
) ))))
)
)
)
(define slurm-20.11-latest (define slurm-20.11-latest
(latest-version slurm-20.11 slurm-20.11-upstream) (latest-version slurm-20.11 slurm-20.11-upstream))
)
(define-public slurm-20.11-glicid (define-public slurm-20.11-glicid
(package (package
(inherit slurm-20.11-latest) (inherit slurm-20.11-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `( (inputs `(("gtk+-2" ,gtk+-2)
("gtk+-2", gtk+-2) ("mariadb:dev" ,mariadb "dev")
("mariadb:dev", mariadb "dev") ,@(package-inputs slurm-20.11-latest)))))
,@(package-inputs slurm-20.11-latest)
))
)
)
(define-public slurm-21.08-upstream (define-public slurm-21.08-upstream
(package (package
(inherit slurm) (inherit slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "21.08.8-2") (version "21.08.8-2")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-"
(sha256 (base32 "01lynxvfzjswq5zxfxzjqjalj1s596lh58f5g8xqb6as9gdcyzgg")) version ".tar.bz2"))
) (sha256
) (base32
) "01lynxvfzjswq5zxfxzjqjalj1s596lh58f5g8xqb6as9gdcyzgg"))))))
)
(define slurm-21.08-latest (define slurm-21.08-latest
(latest-version slurm slurm-21.08-upstream) (latest-version slurm slurm-21.08-upstream))
)
(define-public slurm-21.08-glicid (define-public slurm-21.08-glicid
(package (package
(inherit slurm-21.08-latest) (inherit slurm-21.08-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `( (inputs `(("gtk+-2" ,gtk+-2)
("gtk+-2", gtk+-2) ("mariadb:dev" ,mariadb "dev")
("mariadb:dev", mariadb "dev") ,@(package-inputs slurm-21.08-latest)))))
,@(package-inputs slurm-21.08-latest)
))
)
)
(define-public slurm-22.05-upstream (define-public slurm-22.05-upstream
(package (package
(inherit slurm) (inherit slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "22.05.5") (version "22.05.5")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) (uri (string-append "https://download.schedmd.com/slurm/slurm-"
(sha256 (base32 "1khglnjhnfd7k9x6c5kn40zalvcq0nxinxv5z04p82vw9y6ck1zn")) version ".tar.bz2"))
) (sha256
) (base32
) "1khglnjhnfd7k9x6c5kn40zalvcq0nxinxv5z04p82vw9y6ck1zn"))))))
)
(define slurm-22.05-latest (define slurm-22.05-latest
(latest-version slurm slurm-22.05-upstream) (latest-version slurm slurm-22.05-upstream))
)
(define-public slurm-22.05-glicid (define-public slurm-22.05-glicid
(package (package
(inherit slurm-22.05-latest) (inherit slurm-22.05-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `( (inputs `(("gtk+-2" ,gtk+-2)
("gtk+-2", gtk+-2) ("mariadb:dev" ,mariadb "dev")
("mariadb:dev", mariadb "dev") ,@(package-inputs slurm-22.05-latest)))))
,@(package-inputs slurm-22.05-latest)
))
)
)
(define-public slurm-23.02-upstream (define-public slurm-23.02-upstream
(package (package
(inherit slurm) (inherit slurm)
(name "slurm-upstream") (name "slurm-upstream")
(version "23.02.-pre-b2a2a3109bf1cd1ce899b3b51c5223958510ff27") (version "23.02.-pre-b2a2a3109bf1cd1ce899b3b51c5223958510ff27")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/SchedMD/slurm") (url "https://github.com/SchedMD/slurm")
(commit "b2a2a3109bf1cd1ce899b3b51c5223958510ff27") (commit "b2a2a3109bf1cd1ce899b3b51c5223958510ff27")))
))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "1iwyvkfipizy46fi5plc3h8qvympx41l5bw58jw4kx01qi5fvj0z")) (sha256
) (base32
) "1iwyvkfipizy46fi5plc3h8qvympx41l5bw58jw4kx01qi5fvj0z"))))))
)
)
(define slurm-23.02-latest (define slurm-23.02-latest
(latest-version slurm slurm-23.02-upstream) (latest-version slurm slurm-23.02-upstream))
)
(define-public slurm-23.02-glicid (define-public slurm-23.02-glicid
(package (package
(inherit slurm-23.02-latest) (inherit slurm-23.02-latest)
(name "slurm-glicid") (name "slurm-glicid")
(inputs `( (inputs `(("gtk+-2" ,gtk+-2)
("gtk+-2", gtk+-2) ("mariadb:dev" ,mariadb "dev")
("mariadb:dev", mariadb "dev") ("ucx" ,ucx-latest-glicid) ;not autotested by config
("ucx", ucx-latest-glicid) ; not autotested by config ("podman" ,podman)
("podman", podman) ("lua" ,lua)
("lua", lua) ("lz4" ,lz4)
("lz4", lz4) ,@(package-inputs slurm-23.02-latest)))))
,@(package-inputs slurm-23.02-latest)
))
)
)
(define-public slurm-glicid slurm-22.05-glicid)
(define-public slurm-ccipl slurm-21.08-glicid)
(define-public slurm-glicid-preprod slurm-22.05-glicid)
(define-public slurm-glicid-test slurm-23.02-glicid)
(define-public slurm-glicid
slurm-22.05-glicid)
(define-public slurm-ccipl
slurm-21.08-glicid)
(define-public slurm-glicid-preprod
slurm-22.05-glicid)
(define-public slurm-glicid-test
slurm-23.02-glicid)
slurm-glicid-test slurm-glicid-test

25
glicid/packages/perl.scm
View file

@ -2,27 +2,24 @@
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils))
)
(define-public perl-extutils-embed (define-public perl-extutils-embed
(package (package
(name "perl-extutils-embed") (name "perl-extutils-embed")
(version "1.14") (version "1.14")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/D/DO/DOUGM/ExtUtils-Embed-" version ".tar.gz")) (uri (string-append
(sha256 (base32 "1w55q0wz6i4k9p500mc4wmr8jndnczb6qqrd2m1mrnx13v2mbr7h")) "mirror://cpan/authors/id/D/DO/DOUGM/ExtUtils-Embed-"
) version ".tar.gz"))
) (sha256
(base32
"1w55q0wz6i4k9p500mc4wmr8jndnczb6qqrd2m1mrnx13v2mbr7h"))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments '( (arguments
#:tests? #f '(#:tests? #f))
))
(home-page "https://metacpan.org/release/ExtUtils-Embed") (home-page "https://metacpan.org/release/ExtUtils-Embed")
(synopsis "Utilities for embedding Perl in C/C++ applications") (synopsis "Utilities for embedding Perl in C/C++ applications")
(description "Utilities for embedding Perl in C/C++ applications") (description "Utilities for embedding Perl in C/C++ applications")
(license #f) (license #f)))
)
)

8
glicid/packages/python-science.scm
View file

@ -2,15 +2,14 @@
#: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) #:prefix license:) #:use-module ((guix licenses)
#: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)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages geo) #:use-module (gnu packages geo)
#:use-module (gnu packages python-check) #:use-module (gnu packages python-check))
)
(define-public python-snuggs (define-public python-snuggs
(package (package
@ -50,7 +49,6 @@
;; un tout petit peu de modifications à faire ici ;; un tout petit peu de modifications à faire ici
(define-public python-rasterio (define-public python-rasterio
(package (package
(name "python-rasterio") (name "python-rasterio")

4
glicid/packages/python.scm
View file

@ -10,7 +10,9 @@
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ssh-audit" version)) (uri (pypi-uri "ssh-audit" version))
(sha256 (base32 "1dh5pwa0lhm1a5nvq5abwkqndivk37af5v3a4gj9g6bvpi8zg5rk")))) (sha256
(base32
"1dh5pwa0lhm1a5nvq5abwkqndivk37af5v3a4gj9g6bvpi8zg5rk"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://github.com/jtesta/ssh-audit") (home-page "https://github.com/jtesta/ssh-audit")
(synopsis "An SSH server & client configuration security auditing tool") (synopsis "An SSH server & client configuration security auditing tool")

4
glicid/packages/rust.scm
View file

@ -4,8 +4,8 @@
#:use-module (guix build-system cargo) #:use-module (guix build-system cargo)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-graphics)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
) #:prefix license:))
; ;
;(define rust-clippy-0.0.302 rust-clippy-0.0) ;(define rust-clippy-0.0.302 rust-clippy-0.0)
;(define rust-unicode-xid-0.0.4 rust-unicode-xid-0.0) ;(define rust-unicode-xid-0.0.4 rust-unicode-xid-0.0)

77
glicid/packages/science.scm
View file

@ -25,23 +25,24 @@
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (glicid packages mpi) #:use-module (glicid packages mpi)
#:use-module (glicid utils) #:use-module (glicid utils))
)
(define-public loki (define-public loki
(package (package
(name "loki") (name "loki")
(version "0.1.7") (version "0.1.7")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-" version ".zip")) (uri (string-append
"https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-"
version ".zip"))
(sha256 (sha256
(base32 "0p23k4dipk5nnfpvhhqj9apz8rhnd62qdydjmzx8q78sxpwims4w")))) (base32
"0p23k4dipk5nnfpvhhqj9apz8rhnd62qdydjmzx8q78sxpwims4w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs `(("gcc-toolchain" ,gcc-toolchain)))
`(("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 (description
"Loki is the name of a C++ software library written by Andrei Alexandrescu as part of his book Modern C++ Design. "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.")
@ -54,36 +55,37 @@
(version "2022.01a") (version "2022.01a")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" version ".tar.gz")) (uri (string-append
"https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-"
version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv")))) "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF"
(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=" (string-append "-DQGLVIEWER_INCLUDE_DIR="
(assoc-ref %build-inputs "libqglviewer"))) (assoc-ref %build-inputs
;;(string-append "-DQGLVIEWER_INCLUDE_DIR=" "libqglviewer")))
;;libqglviewer)))) ;; (string-append "-DQGLVIEWER_INCLUDE_DIR="
#:phases ;; libqglviewer))))
(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)
(mkdir-p "./build") (mkdir-p "./build")
(chdir "./build"))) (chdir "./build")))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys) (lambda* (#:key inputs outputs configure-flags
#:allow-other-keys)
(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 ;; (lambda _ (invoke
;;"cmake" "../trunk" ;; "cmake" "../trunk"
;;configure-flags)))))) ;; configure-flags))))))
(propagated-inputs (propagated-inputs `(("gdb" ,gdb)
`(("gdb" ,gdb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("openmpi" ,openmpi) ("openmpi" ,openmpi)
("python" ,python) ("python" ,python)
@ -98,19 +100,17 @@
("python-future" ,python-future) ("python-future" ,python-future)
("python-pyqt" ,python-pyqt) ("python-pyqt" ,python-pyqt)
("python-pyqtwebengine" ,python-pyqtwebengine) ("python-pyqtwebengine" ,python-pyqtwebengine)
("python-qtpy" ,python-qtpy)) ("python-qtpy" ,python-qtpy)))
) (inputs `(("boost" ,boost)
(inputs ("qtbase-5" ,qtbase-5)
`(("boost" ,boost) ;; ("qt" ,qt)
("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) ;; ("loki" ,loki)
;;("vtk" ,vtk) ;; ("vtk" ,vtk)
("qtwebkit" ,qtwebkit) ("qtwebkit" ,qtwebkit)
("openblas" ,openblas) ("openblas" ,openblas)
("suitesparse" ,suitesparse) ("suitesparse" ,suitesparse)
@ -119,10 +119,10 @@
("cgal" ,cgal) ("cgal" ,cgal)
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qtwebengine" ,qtwebengine) ("qtwebengine" ,qtwebengine)
("mpfr" ,mpfr)) ("mpfr" ,mpfr)))
)
(synopsis "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.") (synopsis
"Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.")
(description (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.") "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/")
@ -130,7 +130,6 @@
(define-public yade-glicid-waves (define-public yade-glicid-waves
(package (package
(inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi) yade) "waves")) (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi)
(name "yade-glicid-waves") yade) "waves"))
) (name "yade-glicid-waves")))
)

97
glicid/packages/ssh.scm
View file

@ -4,29 +4,31 @@
#: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 build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages security-token) #:use-module (gnu packages security-token))
)
(define-public libcbor-0.8.0 (define-public libcbor-0.8.0
(package (package
(name "libcbor") (name "libcbor")
(version "0.8.0") (version "0.8.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) (uri (string-append
(sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")))) "http://github.com/PJK/libcbor/archive/refs/tags/v"
version ".tar.gz"))
(sha256
(base32
"12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE"
"-DCMAKE_CXX_FLAGS=-fPIE" "-DCMAKE_C_FLAGS=-fPIE")))
"-DCMAKE_C_FLAGS=-fPIE" )))
(synopsis "libfido2") (synopsis "libfido2")
(description "Todo") (description "Todo")
(home-page "toto") (home-page "toto")
@ -36,25 +38,31 @@
(package (package
(inherit libcbor-0.8.0) (inherit libcbor-0.8.0)
(version "0.9.0") (version "0.9.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) (uri (string-append
(sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs")))))) "http://github.com/PJK/libcbor/archive/refs/tags/v"
version ".tar.gz"))
(sha256
(base32
"1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs"))))))
(define-public libcbor-latest libcbor-0.9.0) (define-public libcbor-latest
libcbor-0.9.0)
(define-public openssh-with-fido2 ;; this is has to be worked again (define-public openssh-with-fido2
;this is has to be worked again
(package (package
(inherit openssh) (inherit openssh)
(name "openssh-with-fido2") (name "openssh-with-fido2")
(arguments `( (arguments
#:test-target "tests" `(#:test-target "tests"
#:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"") #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"")
#:configure-flags `( #:configure-flags `("--sysconfdir=/etc/ssh"
"--sysconfdir=/etc/ssh"
"--with-default-path=/run/current-system/profile/bin" "--with-default-path=/run/current-system/profile/bin"
,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin") ,(string-append "--with-kerberos5="
(assoc-ref %build-inputs "mit-krb5")
"/bin")
"--with-libedit" "--with-libedit"
"--with-security-key-builtin" "--with-security-key-builtin"
,,@(if (hurd-target?) ,,@(if (hurd-target?)
@ -63,35 +71,34 @@
,,@(if (%current-target-system) ,,@(if (%current-target-system)
'("--disable-strip") '("--disable-strip")
'())) '()))
#:phases #:phases (modify-phases %standard-phases
(modify-phases %standard-phases
(add-after 'configure 'reset-/var/empty (add-after 'configure 'reset-/var/empty
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* (substitute* "Makefile"
"Makefile" (("PRIVSEP_PATH=/var/empty")
(("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty")) (string-append "PRIVSEP_PATH=" out "/var/empty")))
) #t)))
#t )))
(add-before 'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
(substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh"))) (substitute* "regress/test-exec.sh"
(substitute* (("/bin/sh")
(list "Makefile" "regress/Makefile") (which "sh")))
(("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))) (substitute* (list "Makefile" "regress/Makefile")
#t )) (("^(tests:.*) t-exec(.*)" all pre post)
(string-append pre post))) #t))
(replace 'install (replace 'install
(lambda* (lambda* (#:key outputs
( (make-flags '()) #:allow-other-keys)
#:key outputs (make-flags '())
#:allow-other-keys
)
(apply invoke "make" "install-nosysconf" make-flags) (apply invoke "make" "install-nosysconf" make-flags)
(install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/")) (install-file "contrib/ssh-copy-id"
(chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555) (string-append (assoc-ref outputs "out")
(install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/")) "/bin/"))
#t ))))) (chmod (string-append (assoc-ref outputs "out")
(inputs `( "/bin/ssh-copy-id") #o555)
("libfido2", libfido2) (install-file "contrib/ssh-copy-id.1"
("libcbor", libcbor) (string-append (assoc-ref outputs "out")
"/share/man/man1/")) #t)))))
(inputs `(("libfido2" ,libfido2)
("libcbor" ,libcbor)
,@(package-inputs openssh))))) ,@(package-inputs openssh)))))

35
glicid/packages/virtualization.scm
View file

@ -8,20 +8,20 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (glicid utils)) #:use-module (glicid utils))
(define-public qemu-latest qemu) (define-public qemu-latest
(define-public qemu-minimal-latest qemu-minimal) qemu)
(define-public qemu-minimal-latest
qemu-minimal)
(define-public qemu-with-rbd (define-public qemu-with-rbd
(package (package
(inherit qemu-latest) (inherit qemu-latest)
(name "qemu-with-rbd") (name "qemu-with-rbd")
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments (package-arguments qemu)
(package-arguments qemu)
((#:tests? _ #f) ((#:tests? _ #f)
#f))) #f)))
(inputs `( (inputs `(("ceph:lib" ,ceph "lib")
("ceph:lib", ceph "lib")
,@(package-inputs qemu))))) ,@(package-inputs qemu)))))
(define-public qemu-minimal-with-rbd (define-public qemu-minimal-with-rbd
@ -29,12 +29,10 @@
(inherit qemu-minimal-latest) (inherit qemu-minimal-latest)
(name "qemu-minimal-with-rbd") (name "qemu-minimal-with-rbd")
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments `(#:tests? #f
`( ,@(package-arguments qemu-minimal))
#:tests? #f ))
,@(package-arguments qemu-minimal)))) (inputs `(("ceph:lib" ,ceph "lib")
(inputs `(
("ceph:lib", ceph "lib" )
,@(package-inputs qemu-minimal))))) ,@(package-inputs qemu-minimal)))))
(define-public libvirt-8.5 (define-public libvirt-8.5
@ -42,9 +40,12 @@
(inherit libvirt) (inherit libvirt)
(name "libvirt") (name "libvirt")
(version "8.5.0") (version "8.5.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (uri (string-append "https://libvirt.org/sources/libvirt-"
(sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0")) version ".tar.xz"))
(patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch")))))) (sha256
(base32
"0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0"))
(patches (search-patches
"glicid/packages/patches/glicid-libvirt-add-install-prefix.patch"))))))

7
glicid/packages/vpn.scm
View file

@ -1,9 +1,8 @@
(define-module (glicid packages vpn) (define-module (glicid packages vpn)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module ((gnu packages vpn) #:prefix gnu:) #:use-module ((gnu packages vpn)
#:use-module (guix download) #:prefix gnu:)
) #:use-module (guix download))
; guix defined openconnect is now newer ; guix defined openconnect is now newer