From 09e78ddc85829ab9ff3075219aad3d60f8f8a439 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Mon, 2 Jan 2023 11:18:12 +0100 Subject: [PATCH] use guix style on *.scm --- glicid/packages/admin.scm | 138 +++--- glicid/packages/algebra.scm | 23 +- glicid/packages/benchmark.scm | 143 +++--- glicid/packages/clam.scm | 47 +- glicid/packages/cluster.scm | 60 ++- glicid/packages/containers.scm | 224 +++++----- glicid/packages/fabric-management.scm | 125 +++--- glicid/packages/file-systems.scm | 122 +++--- glicid/packages/gcc.scm | 30 +- glicid/packages/glicid.scm | 505 ++++++++++------------ glicid/packages/gnome.scm | 15 +- glicid/packages/golang.scm | 12 +- glicid/packages/linux.scm | 443 ++++++++++--------- glicid/packages/maths.scm | 77 ++-- glicid/packages/mpi.scm | 101 ++--- glicid/packages/networking.scm | 123 +++--- glicid/packages/nfs.scm | 86 ++-- glicid/packages/nginx.scm | 599 +++++++++++++------------- glicid/packages/openldap.scm | 251 ++++++----- glicid/packages/parallel.scm | 281 +++++------- glicid/packages/perl.scm | 33 +- glicid/packages/python-science.scm | 24 +- glicid/packages/python.scm | 32 +- glicid/packages/rust.scm | 14 +- glicid/packages/science.scm | 257 ++++++----- glicid/packages/ssh.scm | 189 ++++---- glicid/packages/virtualization.scm | 85 ++-- glicid/packages/vpn.scm | 7 +- 28 files changed, 1981 insertions(+), 2065 deletions(-) diff --git a/glicid/packages/admin.scm b/glicid/packages/admin.scm index 8daac58..0695a01 100644 --- a/glicid/packages/admin.scm +++ b/glicid/packages/admin.scm @@ -1,79 +1,81 @@ (define-module (glicid packages admin) - #:use-module ((gnu packages admin) #:prefix gnu:) - #:use-module (gnu packages base) - #:use-module (gnu packages compression) - #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages groff) - #:use-module (gnu packages hurd) - #:use-module (gnu packages linux) - #:use-module (gnu packages openldap) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (guix download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (glicid packages python) - ) + #:use-module ((gnu packages admin) + #:prefix gnu:) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages groff) + #:use-module (gnu packages hurd) + #:use-module (gnu packages linux) + #:use-module (gnu packages openldap) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (glicid packages python)) (define-public shadow - (package - (inherit gnu:shadow) - (name "shadow") - (version "4.13") - (source (origin - (method url-fetch) - (uri (list (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz"))) - (sha256 (base32 "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls")))))) + (package + (inherit gnu:shadow) + (name "shadow") + (version "4.13") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://github.com/shadow-maint/shadow/releases/download/v" + version "/shadow-" version ".tar.xz"))) + (sha256 + (base32 + "0b6xz415b4y3y5nk3pw9xibv05kln4cjbmhybyncmrx2g5fj9zls")))))) (define-public sudo - (let* ((sudo-minimal gnu:sudo)) - (package - (inherit sudo-minimal) - (name (string-append (package-name sudo-minimal) "-with-ldap")) - (arguments - (substitute-keyword-arguments (package-arguments sudo-minimal) - ((#:configure-flags flags) - `(append (list - "--enable-sasl" - "--with-ldap" - "--enable-openssl" - "--with-nsswitch") - ,flags)))) - (inputs (modify-inputs (package-inputs sudo-minimal) - (append openldap - openssl - cyrus-sasl))) - (native-inputs (modify-inputs (package-native-inputs sudo-minimal) - (append pkg-config)))))) + (let* ((sudo-minimal gnu:sudo)) + (package + (inherit sudo-minimal) + (name (string-append (package-name sudo-minimal) "-with-ldap")) + (arguments + (substitute-keyword-arguments (package-arguments sudo-minimal) + ((#:configure-flags flags) + `(append (list "--enable-sasl" "--with-ldap" "--enable-openssl" + "--with-nsswitch") + ,flags)))) + (inputs (modify-inputs (package-inputs sudo-minimal) + (append openldap openssl cyrus-sasl))) + (native-inputs (modify-inputs (package-native-inputs sudo-minimal) + (append pkg-config)))))) (define-public ansible - (package - (inherit gnu:ansible) - (name "ansible") - (version "6.3.0") - (source (origin - (method url-fetch) - (uri (pypi-uri name version)) - (sha256 (base32 "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm")))) - (propagated-inputs (list ansible-core)))) + (package + (inherit gnu:ansible) + (name "ansible") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "09im4w38bm36arjxmi0jbdrmv6cgnjq4b5ks4kawhicdbb0rzynm")))) + (propagated-inputs (list ansible-core)))) (define-public ansible-core - (package - (inherit gnu:ansible-core) - (name "ansible-core") - (version "2.13.3") - (source (origin - (method url-fetch) - (uri (pypi-uri name version)) - (sha256 (base32 "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf")))) - (arguments - `( - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'sanity-check)))))) + (package + (inherit gnu:ansible-core) + (name "ansible-core") + (version "2.13.3") + (source (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "120rrpj8pqscdf2llipxxvpmg4fxqr3s0vx32f6hq77z60jh9igf")))) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'sanity-check)))))) shadow diff --git a/glicid/packages/algebra.scm b/glicid/packages/algebra.scm index f57799a..2d2f755 100644 --- a/glicid/packages/algebra.scm +++ b/glicid/packages/algebra.scm @@ -2,22 +2,19 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (gnu packages algebra) - #:use-module (gnu packages commencement) -) + #:use-module (gnu packages commencement)) (define-public fftw-openmpi-with-fortran (package - (inherit fftw-openmpi) + (inherit fftw-openmpi) (name "fftw-openmpi-with-fortran") (version "3.3.10") (source (origin - (method url-fetch) - (uri (string-append "https://www.fftw.org/fftw-" version ".tar.gz")) - (sha256 (base32 "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan")) - )) - (inputs `( - ("gfortran-toolchain", gfortran-toolchain) - ,@(package-inputs fftw-openmpi) - )) - ) -) + (method url-fetch) + (uri (string-append "https://www.fftw.org/fftw-" version + ".tar.gz")) + (sha256 + (base32 + "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan")))) + (inputs `(("gfortran-toolchain" ,gfortran-toolchain) + ,@(package-inputs fftw-openmpi))))) diff --git a/glicid/packages/benchmark.scm b/glicid/packages/benchmark.scm index 8f516a1..3eb551f 100644 --- a/glicid/packages/benchmark.scm +++ b/glicid/packages/benchmark.scm @@ -2,36 +2,33 @@ #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #: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 compression) #:use-module (gnu packages mpi) #:use-module (glicid packages mpi) #:use-module (glicid packages gcc) - #:use-module (glicid utils) -) + #:use-module (glicid utils)) (define-public intel-mpi-benchmarks/openmpi-2021.3 (package (inherit gnu:intel-mpi-benchmarks/openmpi) (name "intel-mpi-benchmarks-upstream") (version "2021.3") - (source - (origin - (inherit (package-source gnu:intel-mpi-benchmarks/openmpi)) - (method git-fetch) - (uri (git-reference - (url "https://github.com/intel/mpi-benchmarks") - (commit (string-append "IMB-v" version)) - )) - (file-name (git-file-name name version)) - (sha256 (base32 "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h")) - ) - ) - ) -) + (source (origin + (inherit (package-source gnu:intel-mpi-benchmarks/openmpi)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/mpi-benchmarks") + (commit (string-append "IMB-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h")))))) ;(define-public intel-mpi-benchmarks/openmpi-2021.3-libfabric-rdma ; (transform-package ( @@ -52,59 +49,41 @@ ;) (define-public intel-mpi-benchmarks/openmpi-2021.3-waves - (transform-package ( - (instead-of "openmpi" openmpi-glicid-waves) - intel-mpi-benchmarks/openmpi-2021.3 - ) "waves") -) - - + (transform-package ((instead-of "openmpi" openmpi-glicid-waves) + intel-mpi-benchmarks/openmpi-2021.3) "waves")) (define-public stream-benchmarks (package (name "stream-benchmarks") (version "5.10-jh") (source (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/jeffhammond/STREAM.git") - (commit "HEAD") - ) - ) - (sha256 (base32 "1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m")) - (file-name (string-append name "-" version "-checkout")) - )) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jeffhammond/STREAM.git") + (commit "HEAD"))) + (sha256 + (base32 + "1b5ka2h6rhp2103app6p0vq29y7qixcli9w874hb33y05ggjin8m")) + (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure - (delete 'check) ; no check - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; Le Makefile du paquet ne fournit pas de règle « install » - ;; alors on le fait nous-mêmes. - (let - ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "stream_c.exe" bin) - (install-file "stream_f.exe" bin) - #t - ) - ) - ) - ) - ) - ) - (inputs `( - ("gfortran-toolchain" ,gfortran-toolchain) - )) - (synopsis "STREAM benchmark") - (description "STREAM benchmark") - (home-page "https://") - (license license:gpl2+) ;; check… - ) -) + `(#:phases (modify-phases %standard-phases + (delete 'configure) ;no configure + (delete 'check) ;no check + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; Le Makefile du paquet ne fournit pas de règle « install » + ;; alors on le fait nous-mêmes. + (let ((bin (string-append (assoc-ref outputs "out") + "/bin"))) + (install-file "stream_c.exe" bin) + (install-file "stream_f.exe" bin) #t)))))) + (inputs `(("gfortran-toolchain" ,gfortran-toolchain))) + (synopsis "STREAM benchmark") + (description "STREAM benchmark") + (home-page "https://") + (license license:gpl2+) ;check… + )) ;;defined by gricad / PA Boutier @@ -113,30 +92,24 @@ (name "osu-benchmarks") (version "5.8") (source (origin - (method url-fetch) - (uri (string-append "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" version ".tgz")) - (sha256 (base32 "19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f")) - )) + (method url-fetch) + (uri (string-append + "https://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-" + version ".tgz")) + (sha256 + (base32 + "19a4wg0msipibkxsi8i0c34d07512yfaj2k37dxg5541ysdw690f")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'setenv - (lambda _ - (setenv "CC" (which "mpicc")) - (setenv "CXX" (which "mpic++")) - #t - ) - ) - ) - ) - ) - (propagated-inputs `( - ("openmpi" ,openmpi) - )) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" + (which "mpicc")) + (setenv "CXX" + (which "mpic++")) #t))))) + (propagated-inputs `(("openmpi" ,openmpi))) (synopsis "OSU micro benchmarks") (description "OSU micro benchmark for mpi") (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/") - (license license:gpl2+) - ) -) + (license license:gpl2+))) diff --git a/glicid/packages/clam.scm b/glicid/packages/clam.scm index 38019f5..fe9053a 100644 --- a/glicid/packages/clam.scm +++ b/glicid/packages/clam.scm @@ -1,27 +1,28 @@ (define-module (glicid packages clam) - -#:use-module (guix packages) -#:use-module (guix download) -#:use-module (gnu packages linux) -#:use-module (gnu packages virtualization) -#:use-module (gnu packages storage) -#:use-module (gnu packages gcc) -#:use-module (glicid packages glicid) -#:use-module (guix build-system python) -#:use-module ((guix licenses) #:prefix license:) -#:use-module (guix git-download) -#:use-module (gnu packages python) -#:use-module (guix build-system python) -#:use-module (gnu packages python-web) -#:use-module (gnu packages python-xyz) -#:use-module (gnu packages python-crypto) -#:use-module (gnu packages check) -#:use-module (guix build-system copy) -#:use-module (gnu packages django) -#:use-module (gnu packages time) -#:use-module (gnu packages databases) -#:use-module (gnu packages python-build) ;; setup-tools moved here. -) + + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (gnu packages linux) + #:use-module (gnu packages virtualization) + #:use-module (gnu packages storage) + #:use-module (gnu packages gcc) + #:use-module (glicid packages glicid) + #:use-module (guix build-system python) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix git-download) + #:use-module (gnu packages python) + #:use-module (guix build-system python) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages check) + #:use-module (guix build-system copy) + #:use-module (gnu packages django) + #:use-module (gnu packages time) + #:use-module (gnu packages databases) + #:use-module (gnu packages python-build) ;setup-tools moved here. + ) ;(define-public python-pytest-runner-4.5.1 ; (package diff --git a/glicid/packages/cluster.scm b/glicid/packages/cluster.scm index 80306b3..a1df844 100644 --- a/glicid/packages/cluster.scm +++ b/glicid/packages/cluster.scm @@ -2,9 +2,9 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (gnu packages networking) - #:use-module ((gnu packages cluster) #:prefix gnu:) - #:use-module (glicid utils) -) + #:use-module ((gnu packages cluster) + #:prefix gnu:) + #:use-module (glicid utils)) (define-public keepalived-upstream-2.2.4 (package @@ -12,12 +12,13 @@ (name "keepalived-upstream") (version "2.2.4") (source (origin - (method url-fetch) - (uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz")) - (sha256 (base32 "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01" )) - )) - ) -) + (method url-fetch) + (uri (string-append + "http://www.keepalived.org/software/keepalived-" version + ".tar.gz")) + (sha256 + (base32 + "1py1xdrxzdxn09yi8dx842rmhnc8lv7z09wmb2mfljylhy8dcf01")))))) (define-public keepalived-upstream-2.2.7 (package @@ -25,34 +26,27 @@ (name "keepalived-upstream") (version "2.2.7") (source (origin - (method url-fetch) - (uri (string-append "http://www.keepalived.org/software/keepalived-" version ".tar.gz")) - (sha256 (base32 "17flnzcs8hpj1g8nhhqn6bwbvpksyizcyzk2ah55cjhmfkc406f6" )) - )) - ) -) + (method url-fetch) + (uri (string-append + "http://www.keepalived.org/software/keepalived-" version + ".tar.gz")) + (sha256 + (base32 + "17flnzcs8hpj1g8nhhqn6bwbvpksyizcyzk2ah55cjhmfkc406f6")))))) - -(define local:keepalived keepalived-upstream-2.2.7) -(define keepalived-latest (latest-version local:keepalived gnu:keepalived)) +(define local:keepalived + keepalived-upstream-2.2.7) +(define keepalived-latest + (latest-version local:keepalived gnu:keepalived)) (define-public keepalived-glicid (package (inherit keepalived-latest) (name "keepalived-glicid") - (version (string-append (package-version keepalived-latest) "-glicid" )) + (version (string-append (package-version keepalived-latest) "-glicid")) (arguments - `(#:configure-flags - (list - (string-append "--enable-snmp") - (string-append "--enable-snmp-checker") - (string-append "--enable-snmp-rfc") - ) - ) - ) - (inputs `( - ("net-snmp", net-snmp) - ,@(package-inputs keepalived-latest) - )) - ) -) + `(#:configure-flags (list (string-append "--enable-snmp") + (string-append "--enable-snmp-checker") + (string-append "--enable-snmp-rfc")))) + (inputs `(("net-snmp" ,net-snmp) + ,@(package-inputs keepalived-latest))))) diff --git a/glicid/packages/containers.scm b/glicid/packages/containers.scm index 3ade6dc..f8dd3bb 100644 --- a/glicid/packages/containers.scm +++ b/glicid/packages/containers.scm @@ -1,92 +1,102 @@ (define-module (glicid packages containers) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module ((guix licenses) #:prefix license:) - #:use-module ((gnu packages containers) #:prefix gnu:) - #:use-module (gnu packages linux) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages golang) - #:use-module (gnu packages selinux) - #:use-module (gnu packages bash) - #:use-module (gnu packages version-control) - #:use-module (gnu packages pkg-config) - #:use-module (guix utils) - #:use-module (guix build-system gnu) -) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module ((gnu packages containers) + #:prefix gnu:) + #:use-module (gnu packages linux) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) + #:use-module (gnu packages selinux) + #:use-module (gnu packages bash) + #:use-module (gnu packages version-control) + #:use-module (gnu packages pkg-config) + #:use-module (guix utils) + #:use-module (guix build-system gnu)) (define-public podman (package (name "podman") (version "4.3.1") (source (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") - )) - (sha256 (base32 "04w8lwybsxix4ms6gnsj2xp4xkm567fj0vnlwmjn7kbqxv22jp25")) - )) + (method url-fetch) + (uri (list (string-append + "https://github.com/containers/podman/archive/refs/tags/v" + version ".tar.gz"))) + (sha256 + (base32 + "04w8lwybsxix4ms6gnsj2xp4xkm567fj0vnlwmjn7kbqxv22jp25")))) (home-page "https://podman.io") (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) - (inputs (list btrfs-progs 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 )) + (inputs (list btrfs-progs + 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) (arguments - (list - #:make-flags - #~(list #$(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" #$output) - ) - #:tests? #f - #:test-target "test" - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'set-env - (lambda* (#:key inputs #:allow-other-keys) - (setenv "HOME" "/tmp") - ) - ) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "make" "localsystem") - (invoke "make" "remotesystem") - ) - ) - ) - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* - (find-files "libpod" "\\.go") - (("exec.LookPath[(][\"]slirp4netns[\"][)]") (string-append "exec.LookPath(\"" (which "slirp4netns") "\")")) - ) - (substitute* "hack/install_catatonit.sh" (("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" - (("/usr/libexec/podman/conmon") (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 - (lambda _ - (substitute* "Makefile" (("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 - (lambda _ - (invoke "make" "install.completions" (string-append "PREFIX=" #$output)) - ) - ) - ) - ) - ) - ) -) + (list #:make-flags #~(list #$(string-append "CC=" + (cc-for-target)) + (string-append "PREFIX=" + #$output)) + #:tests? #f + #:test-target "test" + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "localsystem") + (invoke "make" "remotesystem")))) + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* (find-files "libpod" "\\.go") + (("exec.LookPath[(][\"]slirp4netns[\"][)]") + (string-append "exec.LookPath(\"" + (which "slirp4netns") "\")"))) + (substitute* "hack/install_catatonit.sh" + (("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" + (("/usr/libexec/podman/conmon") + (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 + (lambda _ + (substitute* "Makefile" + (("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 + (lambda _ + (invoke "make" "install.completions" + (string-append "PREFIX=" + #$output))))))))) (define-public podman-4.3.0 (package @@ -94,14 +104,13 @@ (name "podman") (version "4.3.0") (source (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") - )) - (sha256 (base32 "0d5zfi6drac23vb2la2v5s2g27hbz9wgiyvlxfm7hgzjh2ds18sm")) - )) - ) -) + (method url-fetch) + (uri (list (string-append + "https://github.com/containers/podman/archive/refs/tags/v" + version ".tar.gz"))) + (sha256 + (base32 + "0d5zfi6drac23vb2la2v5s2g27hbz9wgiyvlxfm7hgzjh2ds18sm")))))) ;; YD : now uptreamed… @@ -126,14 +135,13 @@ (name "podman") (version "4.2.0") (source (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") - )) - (sha256 (base32 "1x5jmmz78ggnlyidc0ivcghpkysd4zkm598jjbf9gkaw09cvry0m")) - )) - ) -) + (method url-fetch) + (uri (list (string-append + "https://github.com/containers/podman/archive/refs/tags/v" + version ".tar.gz"))) + (sha256 + (base32 + "1x5jmmz78ggnlyidc0ivcghpkysd4zkm598jjbf9gkaw09cvry0m")))))) (define-public podman-4.1.1 (package @@ -141,14 +149,13 @@ (name "podman") (version "4.1.1") (source (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") - )) - (sha256 (base32 "198hdf8wg50zcgrl3982yj3xd227224r7mgb135r9vmgn7lk5gr7")) - )) - ) -) + (method url-fetch) + (uri (list (string-append + "https://github.com/containers/podman/archive/refs/tags/v" + version ".tar.gz"))) + (sha256 + (base32 + "198hdf8wg50zcgrl3982yj3xd227224r7mgb135r9vmgn7lk5gr7")))))) (define-public podman-4.1.0 (package @@ -156,11 +163,10 @@ (name "podman") (version "4.1.0") (source (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") - )) - (sha256 (base32 "158fyxv2hd1nwirabrwxascl9lkdphhv0knwrk0qdm0ifcmf257q")) - )) - ) -) + (method url-fetch) + (uri (list (string-append + "https://github.com/containers/podman/archive/refs/tags/v" + version ".tar.gz"))) + (sha256 + (base32 + "158fyxv2hd1nwirabrwxascl9lkdphhv0knwrk0qdm0ifcmf257q")))))) diff --git a/glicid/packages/fabric-management.scm b/glicid/packages/fabric-management.scm index a413ad8..9b7fb4f 100644 --- a/glicid/packages/fabric-management.scm +++ b/glicid/packages/fabric-management.scm @@ -1,105 +1,92 @@ (define-module (glicid packages fabric-management) #:use-module (guix download) #: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 utils) -) + ) (define-public ucx-upstream-1.11.2 (package (inherit gnu:ucx) - (name (string-append (package-name gnu:ucx) "-upstream" )) + (name (string-append (package-name gnu:ucx) "-upstream")) (version "1.11.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openucx/ucx/releases/download/v" + version "/ucx-" version ".tar.gz")) + (sha256 + (base32 + "1py62vjr0hgyqsdpr04jhn918i8ccn6ghjalwpcjpz24admgisyy")))))) (define-public ucx-upstream-1.12.0 (package (inherit gnu:ucx) - (name (string-append (package-name gnu:ucx) "-upstream" )) + (name (string-append (package-name gnu:ucx) "-upstream")) (version "1.12.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "1djxsakwjwnw21hhzsr02w6h2jd2k16bm4pah4iz6k8s5pg99sck")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openucx/ucx/releases/download/v" + version "/ucx-" version ".tar.gz")) + (sha256 + (base32 + "1djxsakwjwnw21hhzsr02w6h2jd2k16bm4pah4iz6k8s5pg99sck")))))) (define-public ucx-upstream-1.12.1 (package (inherit gnu:ucx) - (name (string-append (package-name gnu:ucx) "-upstream" )) + (name (string-append (package-name gnu:ucx) "-upstream")) (version "1.12.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "13mf30gdcqix8dyi0iwnsd5fn8b0syr03042y99s556swz44gd20")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openucx/ucx/releases/download/v" + version "/ucx-" version ".tar.gz")) + (sha256 + (base32 + "13mf30gdcqix8dyi0iwnsd5fn8b0syr03042y99s556swz44gd20")))))) (define-public ucx-upstream-1.13.0 (package (inherit gnu:ucx) - (name (string-append (package-name gnu:ucx) "-upstream" )) + (name (string-append (package-name gnu:ucx) "-upstream")) (version "1.13.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0gay9qsyz5ia68sakq1dakvk3sblh4fawnwzg09q2y723zr82f4a")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openucx/ucx/releases/download/v" + version "/ucx-" version ".tar.gz")) + (sha256 + (base32 + "0gay9qsyz5ia68sakq1dakvk3sblh4fawnwzg09q2y723zr82f4a")))))) (define-public ucx-upstream-1.13.1 (package (inherit gnu:ucx) - (name (string-append (package-name gnu:ucx) "-upstream" )) + (name (string-append (package-name gnu:ucx) "-upstream")) (version "1.13.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openucx/ucx/releases/download/v" version "/ucx-" version ".tar.gz" )) - (sha256 (base32 "0a1qvnlvj2k5xgzkfs3md8ai3mmz6i1zv8w2rhm1s4wfnqlpihzg")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openucx/ucx/releases/download/v" + version "/ucx-" version ".tar.gz")) + (sha256 + (base32 + "0a1qvnlvj2k5xgzkfs3md8ai3mmz6i1zv8w2rhm1s4wfnqlpihzg")))))) - -(define local-ucx ucx-upstream-1.13.1) -(define-public ucx-latest (latest-version local-ucx gnu:ucx)) +(define local-ucx + ucx-upstream-1.13.1) +(define-public ucx-latest + (latest-version local-ucx gnu:ucx)) (define-public ucx-latest-rdma - (transform-package - ( - (instead-of "rdma-core" rdma-core-latest) - ucx-latest - ) "rdma" - ) -) + (transform-package ((instead-of "rdma-core" rdma-core-latest) + ucx-latest) "rdma")) (define-public ucx-latest-glicid - (transform-package - ( - (instead-of "libfabric" libfabric-latest) - ucx-latest-rdma - ) "glicid" - ) -) + (transform-package ((instead-of "libfabric" libfabric-latest) + ucx-latest-rdma) "glicid")) diff --git a/glicid/packages/file-systems.scm b/glicid/packages/file-systems.scm index 0ce572b..99099b3 100644 --- a/glicid/packages/file-systems.scm +++ b/glicid/packages/file-systems.scm @@ -1,5 +1,6 @@ (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 download) #:use-module (guix git-download) @@ -18,69 +19,71 @@ #:use-module (gnu packages flex) #:use-module (gnu packages pkg-config) -) + ) (define-public autofs-glicid (package (name "autofs-glicid") (version "5.1.8") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kernel.org/linux/daemons/autofs/" - "v" (version-major version) "/" - "autofs-" version ".tar.xz")) - (sha256 - (base32 "1zf0fgf6kr9amxq5amlgsp1v13sizwl3wvx2xl7b4r2nhmci0gdk")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://kernel.org/linux/daemons/autofs/" + "v" + (version-major version) + "/" + "autofs-" + version + ".tar.xz")) + (sha256 + (base32 + "1zf0fgf6kr9amxq5amlgsp1v13sizwl3wvx2xl7b4r2nhmci0gdk")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list "--enable-ignore-busy" ; during shutdown - "--enable-sloppy-mount" ; support mount(8) -s - "--with-libtirpc" - (string-append "--with-openldap=" - (assoc-ref %build-inputs "openldap")) - (string-append "--with-sasl=" - (assoc-ref %build-inputs "cyrus-sasl")) -; "HAVE_SSS_AUTOFS=1" ; required to make sssldir click -; (string-append "sssldir=" -; (assoc-ref %build-inputs "sssd") -; "/lib/sssd/modules") - ) - #:tests? #f ; no test suite - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-hard-coded-search-path - (lambda _ - (substitute* "configure" - (("^searchpath=\".*\"") - "searchpath=\"$PATH\"")))) - (add-before 'configure 'fix-rpath - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile.rules" - (("^AUTOFS_LIB_LINK.*=" match) - (string-append match " -Wl,-rpath=" out "/lib")))))) - (add-before 'install 'omit-obsolete-lookup_nis.so-link - ;; Building lookup_yp.so depends on $(YPCLNT) but this doesn't, - ;; leading to a make error. Since it's broken, comment it out. - (lambda _ - (substitute* "modules/Makefile" - (("ln -fs lookup_yp.so" match) - (string-append "# " match)))))))) - (native-inputs - (list bison flex pkg-config rpcsvc-proto)) - (inputs - (list cyrus-sasl - e2fsprogs ; for e[234]fsck - libtirpc - libxml2 ; needed for LDAP, SASL - mit-krb5 ; needed for LDAP, SASL - nfs-utils ; for mount.nfs - openldap - openssl ; needed for SASL - ; sssd - util-linux)) ; for mount, umount + `(#:configure-flags (list "--enable-ignore-busy" ;during shutdown + "--enable-sloppy-mount" ;support mount(8) -s + "--with-libtirpc" + (string-append "--with-openldap=" + (assoc-ref %build-inputs + "openldap")) + (string-append "--with-sasl=" + (assoc-ref %build-inputs + "cyrus-sasl")) + ;; "HAVE_SSS_AUTOFS=1" ; required to make sssldir click + ;; (string-append "sssldir=" + ;; (assoc-ref %build-inputs "sssd") + ;; "/lib/sssd/modules") + ) + #:tests? #f ;no test suite + #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-hard-coded-search-path + (lambda _ + (substitute* "configure" + (("^searchpath=\".*\"") + "searchpath=\"$PATH\"")))) + (add-before 'configure 'fix-rpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile.rules" + (("^AUTOFS_LIB_LINK.*=" match) + (string-append match " -Wl,-rpath=" out "/lib")))))) + (add-before 'install 'omit-obsolete-lookup_nis.so-link + ;; Building lookup_yp.so depends on $(YPCLNT) but this doesn't, + ;; leading to a make error. Since it's broken, comment it out. + (lambda _ + (substitute* "modules/Makefile" + (("ln -fs lookup_yp.so" match) + (string-append "# " match)))))))) + (native-inputs (list bison flex pkg-config rpcsvc-proto)) + (inputs (list cyrus-sasl + e2fsprogs ;for e[234]fsck + libtirpc + libxml2 ;needed for LDAP, SASL + mit-krb5 ;needed for LDAP, SASL + nfs-utils ;for mount.nfs + openldap + openssl ;needed for SASL + ;; sssd + util-linux)) ;for mount, umount ;; XXX A directory index is the closest thing this has to a home page. (home-page "https://www.kernel.org/pub/linux/daemons/autofs/") (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 large and/or frequently changing (network) environment.") ;; fedfs/ is GPL-2-only but not built. - (license (list license:bsd-3 ; modules/cyrus-sasl.c - license:gpl2+)))) ; the rest + (license (list license:bsd-3 ;modules/cyrus-sasl.c + license:gpl2+)))) +; the rest diff --git a/glicid/packages/gcc.scm b/glicid/packages/gcc.scm index 7eed41a..2cd0513 100644 --- a/glicid/packages/gcc.scm +++ b/glicid/packages/gcc.scm @@ -1,32 +1,28 @@ (define-module (glicid packages gcc) #:use-module (guix packages) - #:use-module (gnu packages commencement) ;; for make-gcc-toolchain - #:use-module (gnu packages gcc) ;; for gcc-11 -) + #:use-module (gnu packages commencement) ; for make-gcc-toolchain + #:use-module (gnu packages gcc) ; for gcc-11 + ) ;; beware : access to internal functions… this is probably not the right way to do it … -(define custom-gcc (@@ (gnu packages gcc) custom-gcc) ) -(define %generic-search-paths (@@ (gnu packages gcc) %generic-search-paths )) +(define custom-gcc + (@@ (gnu packages gcc) custom-gcc)) +(define %generic-search-paths + (@@ (gnu packages gcc) %generic-search-paths)) ;; (define-public gfortran-11 - (hidden-package - (custom-gcc gcc-11 "gfortran" '("fortran") - %generic-search-paths - ) - ) -) + (hidden-package (custom-gcc gcc-11 "gfortran" + '("fortran") %generic-search-paths))) (define-public gfortran-toolchain-11 - (package + (package (inherit (make-gcc-toolchain gfortran-11)) (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, as well as libc (headers and binaries, plus debugging symbols - in the @code{debug} output), and binutils." - ) - ) -) + in the @code{debug} output), and binutils."))) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index ecb9fbd..4b7d413 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -4,13 +4,15 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) -; #:use-module (guix licenses) + ;; #:use-module (guix licenses) #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages commencement) #:use-module (guix build-system python) - #:use-module ((guix licenses) #:prefix license:) - #:use-module ((guix utils) #:select (target-64bit?)) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module ((guix utils) + #:select (target-64bit?)) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -23,7 +25,7 @@ #:use-module (gnu packages parallel) #:use-module (gnu packages storage) #:use-module (gnu packages networking) - #:use-module (gnu packages gtk) + #:use-module (gnu packages gtk) #:use-module (gnu packages python) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) @@ -43,7 +45,7 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages web) #:use-module (gnu packages gnome) - #:use-module (gnu packages cluster) + #:use-module (gnu packages cluster) #:use-module (gnu packages libevent) #:use-module (gnu packages xorg) #:use-module (gnu packages fontutils) @@ -54,10 +56,10 @@ #:use-module (gnu packages fontutils) #:use-module (guix build-system gnu) #:use-module (gnu packages image) - #:use-module (gnu packages maths) + #:use-module (gnu packages maths) #:use-module (guix utils) #:use-module (gnu packages cmake) - #:use-module (gnu packages pretty-print) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages boost) #:use-module (gnu packages curl) #:use-module (gnu packages cryptsetup) @@ -66,7 +68,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages authentication) #:use-module (gnu packages bdw-gc) - #:use-module (gnu packages boost) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) @@ -75,9 +77,9 @@ #:use-module (gnu packages disk) #:use-module (gnu packages gperf) #:use-module (gnu packages jemalloc) - #:use-module (gnu packages linux) - #:use-module (gnu packages lua) - #:use-module (gnu packages ncurses) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) + #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages nss) #:use-module (gnu packages openldap) @@ -85,161 +87,145 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) - #:use-module (gnu packages tls) - #:use-module (gnu packages web) -;; #:use-module (gnu packages glicid) + #:use-module (gnu packages tls) + #:use-module (gnu packages web) + ;; #:use-module (gnu packages glicid) #:use-module (gnu packages pretty-print) #:use-module (gnu packages virtualization) -;; #:use-module (glicid packages storage) + ;; #:use-module (glicid packages storage) #:use-module (glicid packages mpi) #:use-module (glicid packages gcc) - -) - - -;;;;;;;; - - -(define-public glicid-librdkafka-09 - (package - (inherit librdkafka) - (name "glicid-librdkafka-09") - (version "0.9.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/edenhill/librdkafka/archive/v" version ".tar.gz")) - (sha256 (base32 "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2")) - )) -)) - - - -(define-public glicid-x2go - (package - (name "glicid-x2go") - (version "4.1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://code.x2go.org/releases/source/x2goserver/x2goserver-" version ".tar.gz")) - (sha256 (base32 "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7")) - )) - - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - - (inputs - `(("perl" , perl))) - - (build-system gnu-build-system) - (synopsis "X2go") - (description "X2go") - (license license:gpl2+) ;; not checked - (home-page "https://wiki.x2go.org") - ) -) - - -(define-public glicid-gromacs-openmpi - (package - (inherit gromacs) - (name "glicid-gromacs-openmpi") - (inputs `(("openmpi", openmpi) - ;; ("openssh", openssh) ;; only for tests... disabled now - ,@(package-inputs gromacs))) - (build-system cmake-build-system) - - (arguments - `(#:configure-flags - (list "-DGMX_DEVELOPER_BUILD=on" ; Needed to run tests - ;; Unbundling - "-DGMX_USE_LMFIT=EXTERNAL" - "-DGMX_BUILD_OWN_FFTW=off" - "-DGMX_EXTERNAL_BLAS=on" - "-DGMX_EXTERNAL_LAPACK=on" - "-DGMX_EXTERNAL_TNG=on" - "-DGMX_EXTERNAL_ZLIB=on" - "-DGMX_EXTERNAL_TINYXML2=on" - ;; special glicid - "-DGMX_MPI=on" - "-DCMAKE_C_COMPILER=mpicc" - "-DCMAKE_CXX_COMPILER=mpicxx" - "-DGMX_DOUBLE=off" - "-DGMX_OPENMP=on" - "-DGMX_SIMD=AVX2_256" - (string-append "-DTinyXML2_DIR=" - (assoc-ref %build-inputs "tinyxml2")) - ;; Workaround for cmake/FindSphinx.cmake version parsing that does - ;; not understand the guix-wrapped `sphinx-build --version' answer - (string-append "-DSPHINX_EXECUTABLE_VERSION=" - ,(package-version python-sphinx))) - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fixes - (lambda* (#:key inputs #:allow-other-keys) - ;; Still bundled: part of gromacs, source behind registration - ;; but free software anyways - ;;(delete-file-recursively "src/external/vmd_molfile") - ;; Still bundled: threads-based OpenMPI-compatible fallback - ;; designed to be bundled like that - ;;(delete-file-recursively "src/external/thread_mpi") - ;; Unbundling - (delete-file-recursively "src/external/lmfit") - (delete-file-recursively "src/external/clFFT") - (delete-file-recursively "src/external/fftpack") - (delete-file-recursively "src/external/build-fftw") - (delete-file-recursively "src/external/tng_io") - (delete-file-recursively "src/external/tinyxml2") - (delete-file-recursively "src/external/googletest") - (copy-recursively (assoc-ref inputs "googletest-source") - "src/external/googletest") - ;; This test warns about the build host hardware, disable - (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" - (("TEST\\(HardwareTopologyTest, HwlocExecute\\)") - "void __guix_disabled()")) - #t))))) - - ) -) +;;;;;;;; +(define-public glicid-librdkafka-09 + (package + (inherit librdkafka) + (name "glicid-librdkafka-09") + (version "0.9.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/edenhill/librdkafka/archive/v" version + ".tar.gz")) + (sha256 + (base32 + "0938yn1msaq8xcj5z7b3jcdy6rslh9kxmvz01r8rdcgbarlvchy2")))))) + +(define-public glicid-x2go + (package + (name "glicid-x2go") + (version "4.1.0.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://code.x2go.org/releases/source/x2goserver/x2goserver-" + version ".tar.gz")) + (sha256 + (base32 + "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7")))) + + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + + (inputs `(("perl" ,perl))) + + (build-system gnu-build-system) + (synopsis "X2go") + (description "X2go") + (license license:gpl2+) ;not checked + (home-page "https://wiki.x2go.org"))) + +(define-public glicid-gromacs-openmpi + (package + (inherit gromacs) + (name "glicid-gromacs-openmpi") + (inputs `(("openmpi" ,openmpi) + ;; ("openssh", openssh) ;; only for tests... disabled now + ,@(package-inputs gromacs))) + (build-system cmake-build-system) + + (arguments + `(#:configure-flags (list "-DGMX_DEVELOPER_BUILD=on" ;Needed to run tests + ;; Unbundling + "-DGMX_USE_LMFIT=EXTERNAL" + "-DGMX_BUILD_OWN_FFTW=off" + "-DGMX_EXTERNAL_BLAS=on" + "-DGMX_EXTERNAL_LAPACK=on" + "-DGMX_EXTERNAL_TNG=on" + "-DGMX_EXTERNAL_ZLIB=on" + "-DGMX_EXTERNAL_TINYXML2=on" + ;; special glicid + "-DGMX_MPI=on" + "-DCMAKE_C_COMPILER=mpicc" + "-DCMAKE_CXX_COMPILER=mpicxx" + "-DGMX_DOUBLE=off" + "-DGMX_OPENMP=on" + "-DGMX_SIMD=AVX2_256" + (string-append "-DTinyXML2_DIR=" + (assoc-ref %build-inputs + "tinyxml2")) + ;; Workaround for cmake/FindSphinx.cmake version parsing that does + ;; not understand the guix-wrapped `sphinx-build --version' answer + (string-append "-DSPHINX_EXECUTABLE_VERSION=" + ,(package-version python-sphinx))) + #:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fixes + (lambda* (#:key inputs #:allow-other-keys) + ;; Still bundled: part of gromacs, source behind registration + ;; but free software anyways + ;; (delete-file-recursively "src/external/vmd_molfile") + ;; Still bundled: threads-based OpenMPI-compatible fallback + ;; designed to be bundled like that + ;; (delete-file-recursively "src/external/thread_mpi") + ;; Unbundling + (delete-file-recursively "src/external/lmfit") + (delete-file-recursively "src/external/clFFT") + (delete-file-recursively "src/external/fftpack") + (delete-file-recursively "src/external/build-fftw") + (delete-file-recursively "src/external/tng_io") + (delete-file-recursively "src/external/tinyxml2") + (delete-file-recursively "src/external/googletest") + (copy-recursively (assoc-ref inputs "googletest-source") + "src/external/googletest") + ;; This test warns about the build host hardware, disable + (substitute* "src/gromacs/hardware/tests/hardwaretopology.cpp" + (("TEST\\(HardwareTopologyTest, HwlocExecute\\)") + "void __guix_disabled()")) + #t))))) + + ) + + ) (define-public glicid-python-nbxmpp - (package - (inherit python-nbxmpp) - (name "glicid-python-nbxmpp") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "nbxmpp" version)) - (sha256 - (base32 - "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr")))) - -)) + (package + (inherit python-nbxmpp) + (name "glicid-python-nbxmpp") + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "nbxmpp" version)) + (sha256 + (base32 + "0vw5drr077w9ks4crnw6pwa4735ycyjdcm54knc3w4in4x5027wr")))) + )) (define-public glicid-specific-hdf5 (package (inherit hdf5-1.12) (name "glicid-specific-hdf5") -; (arguments -; `(#:tests? #f) -; ) - (native-inputs `( - ("gcc",gcc-11) - ("gfortran",gfortran-11) - ,@(package-native-inputs hdf5-1.12))) - ) -) - + ;; (arguments + ;; `(#:tests? #f) + ;; ) + (native-inputs `(("gcc" ,gcc-11) + ("gfortran" ,gfortran-11) + ,@(package-native-inputs hdf5-1.12))))) (define-public glicid-motif (package @@ -247,48 +233,45 @@ (version "2.3.8") (source (origin (method url-fetch) -; (uri (string-append "https://sourceforge.net/projects/motif/files/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz/download")) -; (uri (string-append "mirror://sourceforge/motif/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 "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/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz")) (file-name (string-append name "-" version ".tar.gz")) - (sha256 (base32 "1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5")) - ) - ) + (sha256 + (base32 + "1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5")))) (build-system gnu-build-system) -(arguments + (arguments `(#:make-flags -;; #:make-flags + ;; #:make-flags (list (string-append "PREFIX=" %output) -; (string-append "CC=" ,(cc-for-target)) + ;; (string-append "CC=" ,(cc-for-target)) ;; Xft.h #includes without ‘freetype2/’. The Makefile ;; works around this by hard-coding /usr/include & $PREFIX. (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "freetype") "/include/freetype2") - "V=1") - ) -) + "V=1"))) -(inputs - `(("libxext" ,libxext) - ("libx11", libx11) - ("freetype",freetype) - ("libxft",libxft) - ("xbitmaps",xbitmaps) - ("pkg-config" ,pkg-config) - ("flex" ,flex) - ("bison" ,bison) - ("libxt" ,libxt))) + (inputs `(("libxext" ,libxext) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("libxft" ,libxft) + ("xbitmaps" ,xbitmaps) + ("pkg-config" ,pkg-config) + ("flex" ,flex) + ("bison" ,bison) + ("libxt" ,libxt))) - (synopsis "Motif") + (synopsis "Motif") (description "Motif ") (home-page "https://sourceforge.net/untested") - (license license:gpl2+) ;; probably not !!! - - ) -) + (license license:gpl2+) ;probably not !!! + + )) (define-public glicid-xmgrace (package @@ -297,53 +280,42 @@ (source (origin (method git-fetch) (uri (git-reference - (url "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/grace.git") - (commit (string-append "v" version)))) + (url + "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/grace.git") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "1wb8v0q8xa2akas0swpgdgw1s66i50k7kh1g2f894hnk91fzx56z")) - ) - ) + (sha256 + (base32 + "1wb8v0q8xa2akas0swpgdgw1s66i50k7kh1g2f894hnk91fzx56z")))) (build-system gnu-build-system) - (arguments - `( - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-/bin/sh - (lambda _ - (substitute* '("Make.conf") - (("/bin/sh") (which "bash")) - ) - ) - ) - ) - ) - ) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'configure 'patch-/bin/sh + (lambda _ + (substitute* '("Make.conf") + (("/bin/sh") + (which "bash")))))))) - (inputs - `( - ("libx11", libx11) - ("libxft",libxft) - ("libxt",libxt) - ("libxpm",libxpm) - ("libxext" ,libxext) - ("autoconf", autoconf) - ("glicid-motif" ,glicid-motif) - ("fontconfig", fontconfig) - ("gfortran", gfortran) - ("libjpeg-turbo", libjpeg-turbo) -;; ("libxmhtml", libxmhtml) - ) - ) + (inputs `(("libx11" ,libx11) + ("libxft" ,libxft) + ("libxt" ,libxt) + ("libxpm" ,libxpm) + ("libxext" ,libxext) + ("autoconf" ,autoconf) + ("glicid-motif" ,glicid-motif) + ("fontconfig" ,fontconfig) + ("gfortran" ,gfortran) + ("libjpeg-turbo" ,libjpeg-turbo) + ;; ("libxmhtml", libxmhtml) + )) - - (synopsis "Xmgrace") - (description "xmgrace") - (home-page "https://sourceforge.net/untested") - (license license:gpl2+) ;; probably not - - ) -) + (synopsis "Xmgrace") + (description "xmgrace") + (home-page "https://sourceforge.net/untested") + (license license:gpl2+) ; probably not + + )) (use-modules (guix packages)) (use-modules (guix download)) @@ -351,62 +323,51 @@ (use-modules (guix build-system ruby)) ;(use-modules (guix licenses)) - - (define-public ruby-asciidoctor-revealjs - (package - (name "ruby-asciidoctor-revealjs") - (version "4.1.0") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "asciidoctor-revealjs" version)) - (sha256 - (base32 - "03vmbcc3x059h17ry4qwk1p0yar9wgh87l2qssi307gy45cjw2mq")))) - (build-system ruby-build-system) - (arguments - '(#:tests? #f)) - (propagated-inputs - `(("ruby-asciidoctor" ,ruby-asciidoctor) -; ("ruby-concurrent-ruby" ,ruby-concurrent-ruby) - ("ruby-concurrent" ,ruby-concurrent) - ("ruby-asciidoctor-kroki", ruby-asciidoctor-kroki) - ("ruby-thread-safe" ,ruby-thread-safe))) - (synopsis - "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") - (description - "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") - (home-page - "https://github.com/asciidoctor/asciidoctor-reveal.js") - (license license:expat)) -) + (package + (name "ruby-asciidoctor-revealjs") + (version "4.1.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "asciidoctor-revealjs" version)) + (sha256 + (base32 + "03vmbcc3x059h17ry4qwk1p0yar9wgh87l2qssi307gy45cjw2mq")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) + (propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor) + ;; ("ruby-concurrent-ruby" ,ruby-concurrent-ruby) + ("ruby-concurrent" ,ruby-concurrent) + ("ruby-asciidoctor-kroki" ,ruby-asciidoctor-kroki) + ("ruby-thread-safe" ,ruby-thread-safe))) + (synopsis + "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") + (description + "Converts AsciiDoc documents into HTML5 presentations designed to be executed by the reveal.js presentation framework.") + (home-page "https://github.com/asciidoctor/asciidoctor-reveal.js") + (license license:expat))) (define-public ruby-asciidoctor-kroki -(package - (name "ruby-asciidoctor-kroki") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "asciidoctor-kroki" version)) - (sha256 - (base32 - "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w")))) - (build-system ruby-build-system) - (arguments - '(#:tests? #f)) - (propagated-inputs - `(("ruby-asciidoctor" ,ruby-asciidoctor))) - (synopsis - "An extension for Asciidoctor to convert diagrams to images using https://kroki.io") - (description - "An extension for Asciidoctor to convert diagrams to images using https://kroki.io") - (home-page - "https://github.com/Mogztter/asciidoctor-kroki") - (license license:expat) -) -) + (package + (name "ruby-asciidoctor-kroki") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "asciidoctor-kroki" version)) + (sha256 + (base32 + "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w")))) + (build-system ruby-build-system) + (arguments + '(#:tests? #f)) + (propagated-inputs `(("ruby-asciidoctor" ,ruby-asciidoctor))) + (synopsis + "An extension for Asciidoctor to convert diagrams to images using https://kroki.io") + (description + "An extension for Asciidoctor to convert diagrams to images using https://kroki.io") + (home-page "https://github.com/Mogztter/asciidoctor-kroki") + (license license:expat))) ;; python-glances is now upstreamed as glances in python-xyz diff --git a/glicid/packages/gnome.scm b/glicid/packages/gnome.scm index 021e818..511ea14 100644 --- a/glicid/packages/gnome.scm +++ b/glicid/packages/gnome.scm @@ -5,21 +5,14 @@ #:use-module (gnu packages sssd) #:use-module (gnu packages gnome) #:use-module (glicid utils) - #:use-module (glicid packages vpn) -) + #:use-module (glicid packages vpn)) (define-public glicid-terminator - (package + (package (inherit terminator) (name "glicid-terminator") - (propagated-inputs - `( - ("sssd" ,sssd) - ,@(package-propagated-inputs terminator) - ) - ) - ) -) + (propagated-inputs `(("sssd" ,sssd) + ,@(package-propagated-inputs terminator))))) ;; guix defined version is now on par or newer… diff --git a/glicid/packages/golang.scm b/glicid/packages/golang.scm index c9e8f54..52c5a9a 100644 --- a/glicid/packages/golang.scm +++ b/glicid/packages/golang.scm @@ -1,10 +1,10 @@ (define-module (glicid packages golang) - #:use-module (guix build-system go) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) -) + #:use-module (guix build-system go) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages)) ;(define-public go-github-com-netflix-go-expect-0.0.0-20220104043353-73e0943537d2 ; (package diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 44c8e9f..3265ed9 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -1,242 +1,279 @@ (define-module (glicid packages linux) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system gnu) - #:use-module (guix build-system go) - #:use-module (gnu packages backup) - #:use-module (gnu packages compression) - #:use-module (gnu packages cryptsetup) - #:use-module (gnu packages golang) - #:use-module ((gnu packages linux) #:prefix gnu:) - #:use-module (gnu packages linux) ;; yes : redundant FIXIT - #:use-module (gnu system uuid) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages autotools) - #:use-module (gnu packages python) - #:use-module (gnu packages tls) - #:use-module (glicid packages golang) - #:use-module (glicid utils)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go) + #:use-module (gnu packages backup) + #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages golang) + #:use-module ((gnu packages linux) + #:prefix gnu:) + #:use-module (gnu packages linux) ;yes : redundant FIXIT + #:use-module (gnu system uuid) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages autotools) + #:use-module (gnu packages python) + #:use-module (gnu packages tls) + #:use-module (glicid packages golang) + #:use-module (glicid utils)) (define-public rdma-core-upstream-37.1 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream" )) - (version "37.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "1hjwagf5x48vgshy5s01qjlzjr8kmxpflfcvh8pgj3zbj82zzxiz")))))) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "37.1") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream" )) - (version "38.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "043vybwx9kz4mbbmnj0jzkzsw02vzhkkjc5j3yjdiiqkmsgwr3cs")))))) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "38.0") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream" )) - (version "39.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "0y13px3qgyh3szywjhikw183y54iym9sa60aw0sf51p3kzgg1spn")))))) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "39.0") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream" )) - (version "41.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "0yshfxm9i9fi51mmnxbbv39hqlrc34jzmq6gl2b9f8hzlywdxdz0")))))) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "41.0") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream" )) - (version "42.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "03kclikv4k6rpsj6il131jjbnxyvdaiprc3wkmxn471crxsa9f9y")))))) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "42.0") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream" )) - (version "42.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/linux-rdma/rdma-core/releases/download/v" version "/rdma-core-" version ".tar.gz")) - (sha256 (base32 "02xjksnm71aak215f9262c2qbs77n4yc856ra6dlcfblciqk1cxp")))))) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "42.1") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit gnu:libfabric) - (version "1.13.1") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf")))))) - + (package + (inherit gnu:libfabric) + (version "1.13.1") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "03nkhqjjyw3hwhxrn7rg30qc1gzc1r7p7lymyz5s96m3qhwfsvlf")))))) (define-public libfabric-upstream-1.14.0 - (package - (inherit gnu:libfabric) - (version "1.14.0") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw")))))) + (package + (inherit gnu:libfabric) + (version "1.14.0") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "16klkzkg04wb699mqpi8mn2r8sqzj35zalynbdazyg4ghj4169pw")))))) (define-public libfabric-upstream-1.14.1 - (package - (inherit gnu:libfabric) - (version "1.14.1") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "1vca7p5cczlrayglps8ibdy0fz9nb9pm04jj07cikr58pjabpykc")))))) - + (package + (inherit gnu:libfabric) + (version "1.14.1") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "1vca7p5cczlrayglps8ibdy0fz9nb9pm04jj07cikr58pjabpykc")))))) (define-public libfabric-upstream-1.15.0 - (package - (inherit gnu:libfabric) - (version "1.15.0") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "1slvgih7y7mb30mvnvxm31k202z48pb3yh98vcfmpsyyx9c2r63h")))))) - + (package + (inherit gnu:libfabric) + (version "1.15.0") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "1slvgih7y7mb30mvnvxm31k202z48pb3yh98vcfmpsyyx9c2r63h")))))) (define-public libfabric-upstream-1.15.1 - (package - (inherit gnu:libfabric) - (version "1.15.1") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna")) - ) - ) - (inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h - ("numactl", gnu:numactl) - ,@(package-inputs gnu:libfabric))))) + (package + (inherit gnu:libfabric) + (version "1.15.1") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "1k8h7sa16gdhilkf0bw65xmv8c5dk13szc3rw56hd1nwm42k1yna")))) + (inputs `(("util-linux:lib" ,util-linux "lib") + ;; uuid.h, numa.h + ("numactl" ,gnu:numactl) + ,@(package-inputs gnu:libfabric))))) (define-public libfabric-upstream-1.16.0 - (package - (inherit gnu:libfabric) - (version "1.16.0") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c")) - ) - ) - (inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h - ("numactl", gnu:numactl) - ,@(package-inputs gnu:libfabric))))) + (package + (inherit gnu:libfabric) + (version "1.16.0") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "1lk7abv919bc24ak0yr509bdh8dn83sf6ab326kbvs1wdsfln45c")))) + (inputs `(("util-linux:lib" ,util-linux "lib") + ;; uuid.h, numa.h + ("numactl" ,gnu:numactl) + ,@(package-inputs gnu:libfabric))))) (define-public libfabric-upstream-1.16.1 - (package - (inherit gnu:libfabric) - (version "1.16.1") - (name (string-append (package-name gnu:libfabric) "-upstream" )) - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) - (sha256 (base32 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")) - ) - ) - (inputs `( ("util-linux:lib", util-linux "lib") ;; uuid.h, numa.h - ("numactl", gnu:numactl) - ,@(package-inputs gnu:libfabric))))) + (package + (inherit gnu:libfabric) + (version "1.16.1") + (name (string-append (package-name gnu:libfabric) "-upstream")) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 + "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")))) + (inputs `(("util-linux:lib" ,util-linux "lib") + ;; uuid.h, numa.h + ("numactl" ,gnu:numactl) + ,@(package-inputs gnu:libfabric))))) +(define local-libfabric + libfabric-upstream-1.16.1) - - - -(define local-libfabric libfabric-upstream-1.16.1) - - - -(define-public libfabric-latest (latest-version local-libfabric gnu:libfabric)) +(define-public libfabric-latest + (latest-version local-libfabric gnu:libfabric)) (define-public psm2-upstream-11.2.228 - (package - (inherit gnu:psm2) - (name "psm2-upstream") - (version "11.2.228") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cornelisnetworks/opa-psm2") - (commit (string-append "PSM2_" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz")))))) + (package + (inherit gnu:psm2) + (name "psm2-upstream") + (version "11.2.228") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cornelisnetworks/opa-psm2") + (commit (string-append "PSM2_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz")))))) (define-public psm2-upstream-11.2.230 - (package - (inherit gnu:psm2) - (name "psm2-upstream") - (version "11.2.230") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cornelisnetworks/opa-psm2") - (commit (string-append "PSM2_" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl")))))) + (package + (inherit gnu:psm2) + (name "psm2-upstream") + (version "11.2.230") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cornelisnetworks/opa-psm2") + (commit (string-append "PSM2_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl")))))) +(define local-psm2 + psm2-upstream-11.2.230) - -(define local-psm2 psm2-upstream-11.2.230) - -(define-public psm2-latest (latest-version local-psm2 gnu:psm2)) +(define-public psm2-latest + (latest-version local-psm2 gnu:psm2)) (define-public corefreq - (package - (inherit gnu:corefreq) - (name "corefreq") - (version "1.93.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cyring/CoreFreq") - (commit version))) - (file-name (git-file-name name version)) - (sha256 (base32 "1crp1cmfcfd26j8rg29pl3lbkp135f17jr1686y0cb87v133kcq8")))))) + (package + (inherit gnu:corefreq) + (name "corefreq") + (version "1.93.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cyring/CoreFreq") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1crp1cmfcfd26j8rg29pl3lbkp135f17jr1686y0cb87v133kcq8")))))) diff --git a/glicid/packages/maths.scm b/glicid/packages/maths.scm index 520c506..107f40b 100644 --- a/glicid/packages/maths.scm +++ b/glicid/packages/maths.scm @@ -1,65 +1,58 @@ (define-module (glicid packages maths) #:use-module (guix packages) #: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 mpi) #:use-module (guix download) #:use-module (guix git-download) #:use-module (gnu packages) - #:use-module (glicid utils) -) + #:use-module (glicid utils)) (define-public scalapack-upstream (package - (inherit gnu:scalapack) + (inherit gnu:scalapack) (name "scalapack-upstream") (version "2.1.0-new-upstream") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/scalapack.git") - (commit "myv2.0.2") - ) - ) - (file-name "scalapack-univ-myv2") -; (patches (search-patches "scalapack-blacs-mpi-deprecations.patch")) - (sha256 (base32 "1ccic46psf2hl9wsyflvkn5rxg8k17q578m9mzimvm9brbggf0na" )) - ) - ) + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://oauth2:glpat-RsX2GjsD2WrzXubiJeou@gitlab.univ-nantes.fr/CCIPL/legacy_code_mirror/scalapack.git") + (commit "myv2.0.2"))) + (file-name "scalapack-univ-myv2") + ;; (patches (search-patches "scalapack-blacs-mpi-deprecations.patch")) + (sha256 + (base32 + "1ccic46psf2hl9wsyflvkn5rxg8k17q578m9mzimvm9brbggf0na")))) (arguments - `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES") - #:phases (modify-phases %standard-phases - (add-before 'check 'mpi-setup - ,%openmpi-setup - ) - ) - ) - ) - ) -) + `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES") + #:phases (modify-phases %standard-phases + (add-before 'check 'mpi-setup + ,%openmpi-setup)))))) -(define local:scalapack scalapack-upstream) -(define-public scalapack-latest (latest-version local:scalapack gnu:scalapack)) +(define local:scalapack + scalapack-upstream) +(define-public scalapack-latest + (latest-version local:scalapack gnu:scalapack)) (define-public openblas-upstream-0.3.15 (package (inherit gnu:openblas) (name "openblas-upstream") (version "0.3.15") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/xianyi/OpenBLAS/releases/download/v" version "/OpenBLAS-" version ".tar.gz" )) - (sha256 (base32 "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/xianyi/OpenBLAS/releases/download/v" + version "/OpenBLAS-" version ".tar.gz")) + (sha256 + (base32 + "1gjbkrsh6n28hdp2ciyjigc8vg764d2r0jbzl63v753mjzn9va9h")))))) - -(define local:openblas openblas-upstream-0.3.15) -(define-public scalapack-latest (latest-version local:openblas gnu:openblas)) +(define local:openblas + openblas-upstream-0.3.15) +(define-public scalapack-latest + (latest-version local:openblas gnu:openblas)) diff --git a/glicid/packages/mpi.scm b/glicid/packages/mpi.scm index 8727f48..ed09b88 100644 --- a/glicid/packages/mpi.scm +++ b/glicid/packages/mpi.scm @@ -1,70 +1,59 @@ (define-module (glicid packages mpi) #:use-module (guix packages) #: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 fabric-management) #:use-module (glicid utils) #:use-module (guix utils) #:use-module (glicid packages parallel) - #:use-module (gnu packages) -) + #:use-module (gnu packages)) (define-public openmpi-upstream-4.1.2 (package (inherit gnu:openmpi) (name "openmpi-upstream") (version "4.1.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.open-mpi.org/software/ompi/v" - (version-major+minor version) - "/downloads/openmpi-" version ".tar.bz2")) - (sha256 (base32 "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v")) - (patches (search-patches "openmpi-mtl-priorities.patch")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append "https://www.open-mpi.org/software/ompi/v" + (version-major+minor version) + "/downloads/openmpi-" version ".tar.bz2")) + (sha256 + (base32 + "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v")) + (patches (search-patches "openmpi-mtl-priorities.patch")))))) (define-public openmpi-upstream-4.1.4 (package (inherit gnu:openmpi) (name "openmpi-upstream") (version "4.1.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.open-mpi.org/software/ompi/v" - (version-major+minor version) - "/downloads/openmpi-" version ".tar.bz2")) - (sha256 (base32 "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) - (patches (search-patches "openmpi-mtl-priorities.patch")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append "https://www.open-mpi.org/software/ompi/v" + (version-major+minor version) + "/downloads/openmpi-" version ".tar.bz2")) + (sha256 + (base32 + "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) + (patches (search-patches "openmpi-mtl-priorities.patch")))))) +(define local-openmpi + openmpi-upstream-4.1.4) - - -(define local-openmpi openmpi-upstream-4.1.4) - -(define-public openmpi-latest (latest-version local-openmpi gnu:openmpi)) - +(define-public openmpi-latest + (latest-version local-openmpi gnu:openmpi)) (define-public openmpi-glicid (package - (inherit - (transform-package ((instead-of "slurm" slurm-glicid) openmpi-latest) "glicid") - ) - ) -) + (inherit (transform-package ((instead-of "slurm" slurm-glicid) + openmpi-latest) "glicid")))) (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 ; (transform-package ((instead-of "rdma-core" rdma-core-latest) openmpi-glicid) "rdma-core") @@ -75,35 +64,33 @@ ;) (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 ; (transform-package ((instead-of "ucx" ucx-latest-glicid) openmpi-glicid-libfabric) "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 - (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 - (package - (inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl) openmpi-glicid-libfabric-rdma-ucx-psm2) "waves")) - (name "openmpi-glicid-waves") - ) -) + (package + (inherit (transform-package ((instead-of "slurm-glicid" slurm-ccipl) + openmpi-glicid-libfabric-rdma-ucx-psm2) + "waves")) + (name "openmpi-glicid-waves"))) - -(define openmpi-glicid-transform-gcc-11 (gcc11-instead-of-gcc openmpi-glicid)) +(define openmpi-glicid-transform-gcc-11 + (gcc11-instead-of-gcc openmpi-glicid)) (define-public openmpi-glicid-gcc-11 (package (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")))) diff --git a/glicid/packages/networking.scm b/glicid/packages/networking.scm index eb33e10..15915c6 100644 --- a/glicid/packages/networking.scm +++ b/glicid/packages/networking.scm @@ -1,93 +1,88 @@ (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 download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) -) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages)) (define-public libecap (package (name "libecap") (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.e-cap.org/archive/libecap-" version ".tar.gz")) - (sha256 (base32 "1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4")) - ) - ) + (source (origin + (method url-fetch) + (uri (string-append "https://www.e-cap.org/archive/libecap-" + version ".tar.gz")) + (sha256 + (base32 + "1gn44230z3n5vbwf1lb8ninjmhngc96criy6vc1qj8adw19bpiv4")))) (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.") - (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.") + (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.") + (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/") - (license license:gpl3+) - ) -) + (license license:gpl3+))) (define-public squid (package (inherit gnu:squid) (name "squid") (version "5.7") - (source - (origin - (method url-fetch) - (uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz")) - (sha256 (base32 "10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb")) - ) - ) - (inputs - `(("libecap", libecap) - ,@(package-inputs gnu:squid))) + (source (origin + (method url-fetch) + (uri (string-append + "http://www.squid-cache.org/Versions/v5/squid-" version + ".tar.xz")) + (sha256 + (base32 + "10fdgrdiycphs8ciyn1q5p6dcyngmr614rry6gylx72cpam561vb")))) + (inputs `(("libecap" ,libecap) + ,@(package-inputs gnu:squid))) (arguments - '( - #:configure-flags (list - "--disable-arch-native" "--enable-icmp" "--enable-delay-pools" "--enable-ecap" "--enable-follow-x-forwarded-for" - "--enable-auth" "--enable-auth-basic" "--enable-auth-negotiate" "--enable-auth-ntlm" - "--enable-log-daemon-helpers" - ) - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-true-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "test-suite/testheaders.sh" - (("/bin/true") (search-input-file inputs "/bin/true")) - ) - ) - ) - ) - ) - ) - ) -) + '(#:configure-flags (list "--disable-arch-native" + "--enable-icmp" + "--enable-delay-pools" + "--enable-ecap" + "--enable-follow-x-forwarded-for" + "--enable-auth" + "--enable-auth-basic" + "--enable-auth-negotiate" + "--enable-auth-ntlm" + "--enable-log-daemon-helpers") + #:phases (modify-phases %standard-phases + (add-before 'build 'fix-true-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test-suite/testheaders.sh" + (("/bin/true") + (search-input-file inputs "/bin/true")))))))))) (define-public squid-5.5 (package (inherit squid) (name "squid") (version "5.5") - (source - (origin - (method url-fetch) - (uri (string-append "http://www.squid-cache.org/Versions/v5/squid-" version ".tar.xz")) - (sha256 (base32 "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "http://www.squid-cache.org/Versions/v5/squid-" version + ".tar.xz")) + (sha256 + (base32 + "0v0h949l4wd1hl87a8wkk1fkvj8j44wifyxi9myxdgbnci6lh7af")))))) (define-public openvswitch-2.17 (package (inherit gnu:openvswitch) (name "openvswitch") (version "2.17.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.openvswitch.org/releases/openvswitch-" version ".tar.gz")) - (sha256 (base32 "0sada2a9x9x7x6a45l7iklqh29wsbrdvvgpkyz5cpf5d5fs0sbka")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://www.openvswitch.org/releases/openvswitch-" + version ".tar.gz")) + (sha256 + (base32 + "0sada2a9x9x7x6a45l7iklqh29wsbrdvvgpkyz5cpf5d5fs0sbka")))))) diff --git a/glicid/packages/nfs.scm b/glicid/packages/nfs.scm index fa508b0..9ac32d8 100644 --- a/glicid/packages/nfs.scm +++ b/glicid/packages/nfs.scm @@ -4,7 +4,8 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #: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 shells) #:use-module (gnu packages python) @@ -19,59 +20,48 @@ #:use-module (gnu packages linux) #:use-module (gnu packages jemalloc) #:use-module (gnu packages storage) -; #:use-module (glicid packages storage) -) + ;; #:use-module (glicid packages storage) + ) (define-public nfs-ganesha (package (name "nfs-ganesha") (version "3.5") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/nfs-ganesha/nfs-ganesha.git") - (commit (string-append "V" version)) - (recursive? #t) - ) - ) - (sha256 (base32 "0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4")) - (file-name (string-append name "-" version "-checkout")) - ) - ) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nfs-ganesha/nfs-ganesha.git") + (commit (string-append "V" version)) + (recursive? #t))) + (sha256 + (base32 + "0rdg3mjqrr4a8mywxkfis25gkbn4fylw42hg1d9cvp4dwrjk3hl4")) + (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) - (arguments `( - #:configure-flags (list - (string-append "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib" ) - ) - #:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir ( - lambda _ (chdir "src") - #t - )) - ) - )) - (inputs `( - ("perl", perl) - ("oksh", oksh) - ("python-3", python-3) - ("mit-krb5", mit-krb5) - ("gss", gss) - ("pkg-config", pkg-config) - ("jemalloc", jemalloc) - ("ceph:lib", ceph "lib") - ("libnfsidmap", libnfsidmap) - ("libnfs", libnfs) - ("liburcu", liburcu) - ("bison", bison) - ("flex", flex) - ("libnsl", libnsl) - ("util-linux", util-linux "lib") - )) + (arguments + `(#:configure-flags (list (string-append "-DLIB_INSTALL_DIR=" + (assoc-ref %outputs "out") + "/lib")) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "src") #t))))) + (inputs `(("perl" ,perl) + ("oksh" ,oksh) + ("python-3" ,python-3) + ("mit-krb5" ,mit-krb5) + ("gss" ,gss) + ("pkg-config" ,pkg-config) + ("jemalloc" ,jemalloc) + ("ceph:lib" ,ceph "lib") + ("libnfsidmap" ,libnfsidmap) + ("libnfs" ,libnfs) + ("liburcu" ,liburcu) + ("bison" ,bison) + ("flex" ,flex) + ("libnsl" ,libnsl) + ("util-linux" ,util-linux "lib"))) (synopsis "nfs-ganesha") (description "NFS-Ganesha.") (home-page "https://") - (license license:gpl3+) - ) -) + (license license:gpl3+))) diff --git a/glicid/packages/nginx.scm b/glicid/packages/nginx.scm index 7b8e5a9..57abced 100644 --- a/glicid/packages/nginx.scm +++ b/glicid/packages/nginx.scm @@ -1,306 +1,323 @@ (define-module (glicid packages nginx) - #:use-module (ice-9 match) - #:use-module (guix) - #:use-module (guix build-system gnu) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix utils) - #:use-module (gnu packages compression) - #:use-module (gnu packages curl) - #:use-module (gnu packages geo) - #:use-module (gnu packages pcre) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages web) - #:use-module (gnu packages xml) - #:use-module (gnu packages tls) - #:use-module (glicid packages openldap)) + #:use-module (ice-9 match) + #:use-module (guix) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix utils) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages geo) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages web) + #:use-module (gnu packages xml) + #:use-module (gnu packages tls) + #:use-module (glicid packages openldap)) (define-public nginx - (package - (name "nginx") - (version "1.23.2") - (source (origin - (method url-fetch) - (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) - (sha256 (base32 "0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358")))) - (build-system gnu-build-system) - (inputs (list libxml2 libxslt openssl pcre zlib)) - (arguments - `(#:tests? #f - #:phases - (modify-phases - %standard-phases - (add-before 'configure 'patch-/bin/sh - (lambda _ - (substitute* "auto/feature" - (("/bin/sh") (which "sh"))) - #t)) - (replace 'configure - ;; The configure script is hand-written, not from GNU autotools. - (lambda* (#:key configure-flags inputs outputs #:allow-other-keys) - (let ((flags - (append (list (string-append "--prefix=" (assoc-ref outputs "out")) - "--with-http_ssl_module" - "--with-http_v2_module" - "--with-http_xslt_module" - "--with-http_gzip_static_module" - "--with-http_gunzip_module" - "--with-http_addition_module" - "--with-http_sub_module" - "--with-pcre-jit" - "--with-debug" - "--with-stream" - ;; Even when not cross-building, we pass the - ;; --crossbuild option to avoid customizing for the - ;; kernel version on the build machine. - ,(let ((system "Linux") ; uname -s - (release "3.2.0") ; uname -r - ;; uname -m - (machine (match (or (%current-target-system) - (%current-system)) - ("x86_64-linux" "x86_64") - ("i686-linux" "i686") - ("mips64el-linux" "mips64") - (_ "UNSUPPORTED")))) - (string-append "--crossbuild=" system ":" release ":" machine) - )) - configure-flags))) - (setenv "CC" ,(cc-for-target)) - (setenv "CFLAGS" ; CPPFLAGS is not respected - (string-append "-I" (assoc-ref inputs "libxml2") - "/include/libxml2")) - (format #t "configure flags: ~s~%" flags) - (apply invoke "./configure" flags) - #t))) - (add-after 'install 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man"))) - (install-file "objs/nginx.8" (string-append man "/man8")) - #t))) - (add-after 'install 'fix-root-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/nginx"))) - (rmdir (string-append out "/logs")) - (mkdir-p share) - (rename-file (string-append out "/conf") - (string-append share "/conf")) - (rename-file (string-append out "/html") - (string-append share "/html")) - #t)))))) - (home-page "https://nginx.org") - (synopsis "HTTP and reverse proxy server") - (description - "Nginx (\"engine X\") is a high-performance web and reverse proxy server + (package + (name "nginx") + (version "1.23.2") + (source (origin + (method url-fetch) + (uri (string-append "https://nginx.org/download/nginx-" version + ".tar.gz")) + (sha256 + (base32 + "0ihbkfcqlqadzkdk813raq15qqrahss1gdd81bkswanpsdrc4358")))) + (build-system gnu-build-system) + (inputs (list libxml2 libxslt openssl pcre zlib)) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (add-before 'configure 'patch-/bin/sh + (lambda _ + (substitute* "auto/feature" + (("/bin/sh") + (which "sh"))) #t)) + (replace 'configure + ;; The configure script is hand-written, not from GNU autotools. + (lambda* (#:key configure-flags inputs outputs + #:allow-other-keys) + (let ((flags (append (list (string-append "--prefix=" + (assoc-ref + outputs "out")) + "--with-http_ssl_module" + "--with-http_v2_module" + "--with-http_xslt_module" + "--with-http_gzip_static_module" + "--with-http_gunzip_module" + "--with-http_addition_module" + "--with-http_sub_module" + "--with-pcre-jit" + "--with-debug" + "--with-stream" + ;; Even when not cross-building, we pass the + ;; --crossbuild option to avoid customizing for the + ;; kernel version on the build machine. + ,(let ((system "Linux") + ;uname -s + (release "3.2.0") ;uname -r + ;; uname -m + (machine (match (or (%current-target-system) + (%current-system)) + ("x86_64-linux" + "x86_64") + ("i686-linux" + "i686") + ("mips64el-linux" + "mips64") + (_ "UNSUPPORTED")))) + (string-append "--crossbuild=" + system + ":" + release + ":" + machine))) + configure-flags))) + (setenv "CC" + ,(cc-for-target)) + (setenv "CFLAGS" ;CPPFLAGS is not respected + (string-append "-I" + (assoc-ref inputs "libxml2") + "/include/libxml2")) + (format #t "configure flags: ~s~%" flags) + (apply invoke "./configure" flags) #t))) + (add-after 'install 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man"))) + (install-file "objs/nginx.8" + (string-append man "/man8")) #t))) + (add-after 'install 'fix-root-dirs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/nginx"))) + (rmdir (string-append out "/logs")) + (mkdir-p share) + (rename-file (string-append out "/conf") + (string-append share "/conf")) + (rename-file (string-append out "/html") + (string-append share "/html")) #t)))))) + (home-page "https://nginx.org") + (synopsis "HTTP and reverse proxy server") + (description + "Nginx (\"engine X\") is a high-performance web and reverse proxy server created by Igor Sysoev. It can be used both as a stand-alone web server 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 - (package - (inherit nginx) - (name "nginx-ldap-auth-module") - (version "83c059b73566c2ee9cbda920d91b66657cf120b7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kvspb/nginx-auth-ldap") - (commit version))) - (file-name (git-file-name "nginx-ldap-auth-module" version)) - (sha256 (base32 "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s")))) - (synopsis "LDAP Authentication module for nginx") - (description "LDAP module for nginx which supports authentication against multiple LDAP servers.") - (build-system gnu-build-system) - (inputs - `(("nginx-sources" ,(package-source nginx)) - ("openldap", openldap) - ,@(package-inputs nginx))) - (arguments - (substitute-keyword-arguments - `(#:configure-flags '("--add-dynamic-module=.") - #:make-flags '("modules") ,@(package-arguments nginx)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'unpack-nginx-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (begin - (format #t "decompressing nginx source code~%") - (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) - (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1")) - #t ))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) - (install-file "objs/ngx_http_auth_ldap_module.so" modules-dir) - #t ))) - (delete 'fix-root-dirs) - (delete 'install-man-page))))))) + (package + (inherit nginx) + (name "nginx-ldap-auth-module") + (version "83c059b73566c2ee9cbda920d91b66657cf120b7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kvspb/nginx-auth-ldap") + (commit version))) + (file-name (git-file-name "nginx-ldap-auth-module" version)) + (sha256 + (base32 + "023zmdir7w92dnb508ggskkc7kmd7k71hc597sb7i4xfgpwxzq1s")))) + (synopsis "LDAP Authentication module for nginx") + (description + "LDAP module for nginx which supports authentication against multiple LDAP servers.") + (build-system gnu-build-system) + (inputs `(("nginx-sources" ,(package-source nginx)) + ("openldap" ,openldap) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.") + #:make-flags '("modules") + ,@(package-arguments nginx)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + (format #t "decompressing nginx source code~%") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs + "--strip-components=1")) #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((modules-dir (string-append (assoc-ref outputs "out") + "/etc/nginx/modules"))) + (install-file "objs/ngx_http_auth_ldap_module.so" modules-dir) + #t))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))))) (define-public modsecurity - (package - (name "modsecurity") - (version "3.0.8") - (source - (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/SpiderLabs/ModSecurity/releases/download/v" version "/modsecurity-v" version ".tar.gz") - )) - (sha256 (base32 "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2")))) - (synopsis "modsecurity module for nginx") - (description "modsecurity module for nginx.") - (license license:asl2.0) - (home-page "https://github.com/SpiderLabs/ModSecurity") - (build-system gnu-build-system) - (inputs `( - ("curl", curl) - ("libxml2", libxml2) - ("libxslt", libxslt) - ("openssl", openssl) - ("pcre", pcre) - ("pcre:bin", pcre "bin") - ("zlib", zlib) - ("pkg-config", pkg-config) - ("nginx-sources", (package-source nginx)) - )) - (arguments - `( #:configure-flags (list - (string-append "--with-curl=" (assoc-ref %build-inputs "curl")) - (string-append "--with-pcre=" (assoc-ref %build-inputs "pcre:bin") "/bin/pcre-config") - (string-append "--with-libxml=" (assoc-ref %build-inputs "libxml2")) - "--enable-standalone-module" ))))) + (package + (name "modsecurity") + (version "3.0.8") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://github.com/SpiderLabs/ModSecurity/releases/download/v" + version "/modsecurity-v" version ".tar.gz"))) + (sha256 + (base32 + "1isng4z2xijqq92105si1zxkzlx4ifdnn38d7n38mrfp7jdwhhg2")))) + (synopsis "modsecurity module for nginx") + (description "modsecurity module for nginx.") + (license license:asl2.0) + (home-page "https://github.com/SpiderLabs/ModSecurity") + (build-system gnu-build-system) + (inputs `(("curl" ,curl) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("pcre:bin" ,pcre "bin") + ("zlib" ,zlib) + ("pkg-config" ,pkg-config) + ("nginx-sources" ,(package-source nginx)))) + (arguments + `(#:configure-flags (list (string-append "--with-curl=" + (assoc-ref %build-inputs "curl")) + (string-append "--with-pcre=" + (assoc-ref %build-inputs + "pcre:bin") + "/bin/pcre-config") + (string-append "--with-libxml=" + (assoc-ref %build-inputs + "libxml2")) + "--enable-standalone-module"))))) (define-public nginx-modsecurity-module - (package - (inherit nginx) - (name "nginx-modsecurity-module") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" version "/modsecurity-nginx-v" version ".tar.gz") - )) - (sha256 (base32 "1pcayz0kkpr0fvs8fwai0xv7jw9r7ph66vwxm6vrq0mc11r1r0df")) - ) - ) - (synopsis "ModSecurity module for nginx") - (description "ModSecurity module for nginx.") - (build-system gnu-build-system) - (inputs - `(("nginx-sources" ,(package-source nginx)) - ("modsecurity", modsecurity) - ,@(package-inputs nginx))) - (arguments - (substitute-keyword-arguments - `(#:configure-flags '("--add-dynamic-module=.") - #:make-flags '("modules") - ,@(package-arguments nginx) - ) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'unpack-nginx-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (begin - ;; The nginx source code is part of the module’s source. - (format #t "decompressing nginx source code~%") - (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) - (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") - ) - #t ))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) - (install-file "objs/ngx_http_modsecurity_module.so" modules-dir) - #t ))) - (delete 'fix-root-dirs) - (delete 'install-man-page))))))) + (package + (inherit nginx) + (name "nginx-modsecurity-module") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v" + version "/modsecurity-nginx-v" version ".tar.gz"))) + (sha256 + (base32 + "1pcayz0kkpr0fvs8fwai0xv7jw9r7ph66vwxm6vrq0mc11r1r0df")))) + (synopsis "ModSecurity module for nginx") + (description "ModSecurity module for nginx.") + (build-system gnu-build-system) + (inputs `(("nginx-sources" ,(package-source nginx)) + ("modsecurity" ,modsecurity) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.") + #:make-flags '("modules") + ,@(package-arguments nginx)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs + "--strip-components=1")) #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((modules-dir (string-append (assoc-ref outputs "out") + "/etc/nginx/modules"))) + (install-file "objs/ngx_http_modsecurity_module.so" + modules-dir) #t))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))))) (define-public nginx-geoip2-module - (package - (inherit nginx) - (name "nginx-geoip2-module") - (version "3.4") - (source - (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" version ".tar.gz") - )) - (sha256 (base32 "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd")))) - (synopsis "GeoIP2 module for nginx") - (description "GeoIP2 module for nginx.") - (build-system gnu-build-system) - (inputs - `(("nginx-sources" ,(package-source nginx)) - ("libmaxminddb", libmaxminddb) - ,@(package-inputs nginx))) - (arguments - (substitute-keyword-arguments - `(#:configure-flags '("--add-dynamic-module=.") - #:make-flags '("modules") ,@(package-arguments nginx)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'unpack-nginx-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (begin - ;; The nginx source code is part of the module’s source. - (format #t "decompressing nginx source code~%") - (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) - (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") - ) - #t ))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (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_stream_geoip2_module.so" modules-dir) - #t ))) - (delete 'fix-root-dirs) - (delete 'install-man-page))))))) + (package + (inherit nginx) + (name "nginx-geoip2-module") + (version "3.4") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://github.com/leev/ngx_http_geoip2_module/archive/refs/tags/" + version ".tar.gz"))) + (sha256 + (base32 + "0lllgnasd97r6xkj70q42rp61cxrz8qlb64l14rmlwcd6hizqwmd")))) + (synopsis "GeoIP2 module for nginx") + (description "GeoIP2 module for nginx.") + (build-system gnu-build-system) + (inputs `(("nginx-sources" ,(package-source nginx)) + ("libmaxminddb" ,libmaxminddb) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.") + #:make-flags '("modules") + ,@(package-arguments nginx)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs + "--strip-components=1")) #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (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_stream_geoip2_module.so" modules-dir) + #t))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))))) (define-public nginx-http_subs_filter-module - (package - (inherit nginx) - (name "nginx-http_subs_filter-module") - (version "e12e965") - (source - (origin - (method url-fetch) - (uri (list - (string-append "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" version ".tar.gz") - )) - (sha256 (base32 "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans")))) - (synopsis "substitutions_filter module for nginx") - (description "substitutions_filter module for nginx.") - (build-system gnu-build-system) - (inputs - `(("nginx-sources" ,(package-source nginx)) - ,@(package-inputs nginx))) - (arguments - (substitute-keyword-arguments - `(#:configure-flags '("--add-dynamic-module=.") - #:make-flags '("modules") ,@(package-arguments nginx)) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'unpack-nginx-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (begin - ;; The nginx source code is part of the module’s source. - (format #t "decompressing nginx source code~%") - (let ((tar (assoc-ref inputs "tar")) (nginx-srcs (assoc-ref inputs "nginx-sources"))) - (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs "--strip-components=1") - ) - #t ))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((modules-dir (string-append (assoc-ref outputs "out") "/etc/nginx/modules"))) - (install-file "objs/ngx_http_subs_filter_module.so" modules-dir) - #t ))) - (delete 'fix-root-dirs) - (delete 'install-man-page))))))) + (package + (inherit nginx) + (name "nginx-http_subs_filter-module") + (version "e12e965") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://github.com/yaoweibin/ngx_http_substitutions_filter_module/archive/" + version ".tar.gz"))) + (sha256 + (base32 + "1cxb3yv6085rj50s001p2vblvz5px2v92whwjhb14kl8fnm2cans")))) + (synopsis "substitutions_filter module for nginx") + (description "substitutions_filter module for nginx.") + (build-system gnu-build-system) + (inputs `(("nginx-sources" ,(package-source nginx)) + ,@(package-inputs nginx))) + (arguments + (substitute-keyword-arguments `(#:configure-flags '("--add-dynamic-module=.") + #:make-flags '("modules") + ,@(package-arguments nginx)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-nginx-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (begin + ;; The nginx source code is part of the module’s source. + (format #t "decompressing nginx source code~%") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") "xvf" nginx-srcs + "--strip-components=1")) #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((modules-dir (string-append (assoc-ref outputs "out") + "/etc/nginx/modules"))) + (install-file "objs/ngx_http_subs_filter_module.so" + modules-dir) #t))) + (delete 'fix-root-dirs) + (delete 'install-man-page))))))) diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm index 6c8e12f..f4a24c2 100644 --- a/glicid/packages/openldap.scm +++ b/glicid/packages/openldap.scm @@ -1,127 +1,152 @@ (define-module (glicid packages openldap) - #:use-module (guix build-system gnu) - #:use-module (guix download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (gnu packages autotools) - #:use-module (gnu packages compression) - #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages databases) - #:use-module (gnu packages dbm) - #:use-module (gnu packages gnupg) - #:use-module (gnu packages groff) - #:use-module (gnu packages kerberos) - #:use-module (gnu packages libevent) - #:use-module (gnu packages linux) - #:use-module ((gnu packages openldap) #:prefix gnu:) - #:use-module (gnu packages password-utils) - #:use-module (gnu packages perl) - #:use-module (gnu packages python) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages tls)) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages groff) + #:use-module (gnu packages kerberos) + #:use-module (gnu packages libevent) + #:use-module (gnu packages linux) + #:use-module ((gnu packages openldap) + #:prefix gnu:) + #:use-module (gnu packages password-utils) + #:use-module (gnu packages perl) + #:use-module (gnu packages python) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls)) (define-public openldap - (package - (name "openldap") - (version "2.6.3") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) - (sha256 (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj")))) - (build-system gnu-build-system) - (inputs (list argon2 cyrus-sasl libevent libgcrypt libltdl lz4 openssl perl snappy unixodbc wiredtiger zlib)) - (native-inputs (list bdb groff libtool pkg-config)) - (arguments '( - ; this is needed because the make check does not work inside guix - #:tests? #f - #:configure-flags '( - "--enable-debug" - "--enable-dynamic" - "--enable-syslog" - "--enable-ipv6" - "--enable-local" - "--enable-slapd" - "--enable-dynacl" - "--enable-aci" - "--enable-cleartext" - "--enable-crypt" - "--enable-spasswd" - "--enable-modules" - "--enable-rlookups" - "--enable-slapi" - "--enable-backends=mod" - "--enable-overlays=mod" - "--enable-argon2" - "--enable-balancer" - "--disable-static" - "--enable-shared" - "--with-tls=openssl" - ) - #:make-flags '("STRIP=") - #:phases (modify-phases %standard-phases - (add-before 'build 'make-depend - (lambda* (#:key input #:allow-other-keys) - (invoke "make" "depend")))))) - (synopsis "Implementation of the Lightweight Directory Access Protocol") - (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") - (license license:openldap2.8) - (home-page "https://www.openldap.org/"))) + (package + (name "openldap") + (version "2.6.3") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" + version ".tgz"))) + (sha256 + (base32 + "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj")))) + (build-system gnu-build-system) + (inputs (list argon2 + cyrus-sasl + libevent + libgcrypt + libltdl + lz4 + openssl + perl + snappy + unixodbc + wiredtiger + zlib)) + (native-inputs (list bdb groff libtool pkg-config)) + (arguments + '(;; this is needed because the make check does not work inside guix + #:tests? #f + #:configure-flags '("--enable-debug" "--enable-dynamic" + "--enable-syslog" + "--enable-ipv6" + "--enable-local" + "--enable-slapd" + "--enable-dynacl" + "--enable-aci" + "--enable-cleartext" + "--enable-crypt" + "--enable-spasswd" + "--enable-modules" + "--enable-rlookups" + "--enable-slapi" + "--enable-backends=mod" + "--enable-overlays=mod" + "--enable-argon2" + "--enable-balancer" + "--disable-static" + "--enable-shared" + "--with-tls=openssl") + #:make-flags '("STRIP=") + #:phases (modify-phases %standard-phases + (add-before 'build 'make-depend + (lambda* (#:key input #:allow-other-keys) + (invoke "make" "depend")))))) + (synopsis "Implementation of the Lightweight Directory Access Protocol") + (description + "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") + (license license:openldap2.8) + (home-page "https://www.openldap.org/"))) (define-public openldap-2.4.59 - (package - (inherit openldap) - (name "openldap") - (version "2.4.59") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) - (sha256 (base32 "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr")))))) + (package + (inherit openldap) + (name "openldap") + (version "2.4.59") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" + version ".tgz"))) + (sha256 + (base32 + "0d1gw898gbkv46mw0gll3q0w2j2y9midlzh6f320d0nq8xkpvwwr")))))) (define-public openldap-2.5.13 - (package - (inherit openldap) - (name "openldap") - (version "2.5.13") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" version ".tgz"))) - (sha256 (base32 "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f")))))) + (package + (inherit openldap) + (name "openldap") + (version "2.5.13") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-" + version ".tgz"))) + (sha256 + (base32 + "13007pv1vpp31dvnf9xzzcknqv9p75rqq412nrbprf7p9q646g7f")))))) (define-public nss-pam-ldapd - (package - (name "nss-pam-ldapd") - (version "0.9.12") - (source (origin - (method url-fetch) - (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" version ".tar.gz")) - (sha256 (base32 "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6")))) - (build-system gnu-build-system) - (arguments - `( - #:configure-flags - (list (string-append - "--with-pam-seclib-dir=" (assoc-ref %outputs "out") "/lib/security/") - "--with-ldap-conf-file=/etc/nslcd.conf" ) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'override-nslcd.conf-install-path - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile.in" - ( - ("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)") - (string-append (assoc-ref outputs "out") "/etc/nslcd.conf.example")))))))) - (inputs `( - ("linux-pam", linux-pam) - ("mit-krb5", mit-krb5) - ("openldap", openldap) - ("python", python))) - (home-page "https://arthurdejong.org/nss-pam-ldapd") - (synopsis "NSS and PAM modules for LDAP") - (description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS) + (package + (name "nss-pam-ldapd") + (version "0.9.12") + (source (origin + (method url-fetch) + (uri (string-append + "https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-" + version ".tar.gz")) + (sha256 + (base32 + "050fzcmxmf6y15dlcffc4gxr3wkk7fliqqwhlwqzbjwk8vkn3mn6")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append "--with-pam-seclib-dir=" + (assoc-ref %outputs "out") + "/lib/security/") + "--with-ldap-conf-file=/etc/nslcd.conf") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'override-nslcd.conf-install-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.in" + (("\\$\\(DESTDIR\\)\\$\\(NSLCD_CONF_PATH\\)") + (string-append (assoc-ref outputs "out") + "/etc/nslcd.conf.example")))))))) + (inputs `(("linux-pam" ,linux-pam) + ("mit-krb5" ,mit-krb5) + ("openldap" ,openldap) + ("python" ,python))) + (home-page "https://arthurdejong.org/nss-pam-ldapd") + (synopsis "NSS and PAM modules for LDAP") + (description + "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS) module that allows your LDAP server to provide user account, group, host name, 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 Authentication Module} (PAM) to do identity and authentication management with an LDAP server.") - (license license:lgpl2.1+))) + (license license:lgpl2.1+))) diff --git a/glicid/packages/parallel.scm b/glicid/packages/parallel.scm index fd5991b..266915b 100644 --- a/glicid/packages/parallel.scm +++ b/glicid/packages/parallel.scm @@ -3,9 +3,10 @@ #:use-module (guix download) #:use-module (guix git-download) #: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 gtk) + #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -14,241 +15,195 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages databases) #:use-module (glicid utils) - #:use-module (glicid packages fabric-management) ; for latest ucx - #:use-module (glicid packages containers) ; for latest podman - #:use-module (gnu packages compression) ; lz4 - #:use-module (gnu packages lua) ; lua -) + #:use-module (glicid packages fabric-management) ;for latest ucx + #:use-module (glicid packages containers) ;for latest podman + #:use-module (gnu packages compression) ;lz4 + #:use-module (gnu packages lua) ;lua + ) (define-public openpmix-3.1.5 (package (name "openpmix") (version "3.1.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openpmix/openpmix/releases/download/v" version "/pmix-" version ".tar.bz2")) - (sha256 (base32 "1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8")) - ) - ) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openpmix/openpmix/releases/download/v" + version "/pmix-" version ".tar.bz2")) + (sha256 + (base32 + "1xswdkfcrw123ghcr9gmrb852nzjbl4i6qwrid3xyma42yal34w8")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list - (string-append "--with-hwloc=" (assoc-ref %build-inputs "hwloc")) - ) - ) - ) + `(#:configure-flags (list (string-append "--with-hwloc=" + (assoc-ref %build-inputs "hwloc"))))) (synopsis "MPIX lib") - (description"MPIX. More to come. FIXIT") + (description "MPIX. More to come. FIXIT") (home-page "https://www.gnu.org/software/hello/") (license license:gpl3+) - (inputs `( - ("libevent", libevent) - ("hwloc" ,hwloc-2 "lib") - ("perl", perl) - )) - ) -) + (inputs `(("libevent" ,libevent) + ("hwloc" ,hwloc-2 "lib") + ("perl" ,perl))))) (define-public openpmix-4.1.0 (package (inherit openpmix-3.1.5) (version "4.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/openpmix/openpmix/releases/download/v" version "/pmix-" version ".tar.bz2")) - (sha256 (base32 "0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql")) - ) - ) - (inputs `( - ("python", python) - ("zlib", zlib) - ("pandoc", pandoc) - ,@(package-inputs openpmix-3.1.5) - )) - ) -) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openpmix/openpmix/releases/download/v" + version "/pmix-" version ".tar.bz2")) + (sha256 + (base32 + "0bl4gkh87csm3yh418wvrih35mg6swavcxj78gyb7gr1qsk0apql")))) + (inputs `(("python" ,python) + ("zlib" ,zlib) + ("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 - (package + (package (inherit slurm-20.02) (name "slurm-upstream") (version "20.02.7") - (source - (origin - (inherit (package-source slurm-20.02)) - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")) - ) - ) - ) -) + (source (origin + (inherit (package-source slurm-20.02)) + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" + version ".tar.bz2")) + (sha256 + (base32 + "1khlv69q41chgkcs1i7l651hvyx8sz3j9yhjbgky3gpqrgrmz1h6")))))) (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 - (package + (package (inherit slurm-20.02-latest) (name "slurm-glicid") - (inputs `( - ("gtk+-2", gtk+-2) - ("mariadb:dev", mariadb "dev") - ,@(package-inputs slurm-20.02-latest) - )) - ) -) + (inputs `(("gtk+-2" ,gtk+-2) + ("mariadb:dev" ,mariadb "dev") + ,@(package-inputs slurm-20.02-latest))))) (define-public slurm-20.11-upstream - (package + (package (inherit slurm-20.11) (name "slurm-upstream") (version "20.11.9") - (source - (origin - (inherit (package-source slurm-20.11)) - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m")) + (source (origin + (inherit (package-source slurm-20.11)) + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" + version ".tar.bz2")) + (sha256 + (base32 + "0xq2d6dm285y541dyg1h66z7svsisrq8c81ag0f601xz1cn3mq9m")) - ) - ) - ) -) + )))) (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 - (package + (package (inherit slurm-20.11-latest) (name "slurm-glicid") - (inputs `( - ("gtk+-2", gtk+-2) - ("mariadb:dev", mariadb "dev") - ,@(package-inputs slurm-20.11-latest) - )) - ) -) - + (inputs `(("gtk+-2" ,gtk+-2) + ("mariadb:dev" ,mariadb "dev") + ,@(package-inputs slurm-20.11-latest))))) (define-public slurm-21.08-upstream - (package + (package (inherit slurm) (name "slurm-upstream") (version "21.08.8-2") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "01lynxvfzjswq5zxfxzjqjalj1s596lh58f5g8xqb6as9gdcyzgg")) - ) - ) - ) -) + (source (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" + version ".tar.bz2")) + (sha256 + (base32 + "01lynxvfzjswq5zxfxzjqjalj1s596lh58f5g8xqb6as9gdcyzgg")))))) (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 - (package + (package (inherit slurm-21.08-latest) (name "slurm-glicid") - (inputs `( - ("gtk+-2", gtk+-2) - ("mariadb:dev", mariadb "dev") - ,@(package-inputs slurm-21.08-latest) - )) - ) -) + (inputs `(("gtk+-2" ,gtk+-2) + ("mariadb:dev" ,mariadb "dev") + ,@(package-inputs slurm-21.08-latest))))) (define-public slurm-22.05-upstream - (package + (package (inherit slurm) (name "slurm-upstream") (version "22.05.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) - (sha256 (base32 "1khglnjhnfd7k9x6c5kn40zalvcq0nxinxv5z04p82vw9y6ck1zn")) - ) - ) - ) -) - + (source (origin + (method url-fetch) + (uri (string-append "https://download.schedmd.com/slurm/slurm-" + version ".tar.bz2")) + (sha256 + (base32 + "1khglnjhnfd7k9x6c5kn40zalvcq0nxinxv5z04p82vw9y6ck1zn")))))) (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 - (package + (package (inherit slurm-22.05-latest) (name "slurm-glicid") - (inputs `( - ("gtk+-2", gtk+-2) - ("mariadb:dev", mariadb "dev") - ,@(package-inputs slurm-22.05-latest) - )) - ) -) + (inputs `(("gtk+-2" ,gtk+-2) + ("mariadb:dev" ,mariadb "dev") + ,@(package-inputs slurm-22.05-latest))))) (define-public slurm-23.02-upstream - (package + (package (inherit slurm) (name "slurm-upstream") (version "23.02.-pre-b2a2a3109bf1cd1ce899b3b51c5223958510ff27") - (source - (origin - - (method git-fetch) - (uri (git-reference - (url "https://github.com/SchedMD/slurm") - (commit "b2a2a3109bf1cd1ce899b3b51c5223958510ff27") - )) - (file-name (git-file-name name version)) - (sha256 (base32 "1iwyvkfipizy46fi5plc3h8qvympx41l5bw58jw4kx01qi5fvj0z")) - ) - ) - ) -) + (source (origin + + (method git-fetch) + (uri (git-reference + (url "https://github.com/SchedMD/slurm") + (commit "b2a2a3109bf1cd1ce899b3b51c5223958510ff27"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1iwyvkfipizy46fi5plc3h8qvympx41l5bw58jw4kx01qi5fvj0z")))))) (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 (package (inherit slurm-23.02-latest) (name "slurm-glicid") - (inputs `( - ("gtk+-2", gtk+-2) - ("mariadb:dev", mariadb "dev") - ("ucx", ucx-latest-glicid) ; not autotested by config - ("podman", podman) - ("lua", lua) - ("lz4", lz4) - ,@(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) + (inputs `(("gtk+-2" ,gtk+-2) + ("mariadb:dev" ,mariadb "dev") + ("ucx" ,ucx-latest-glicid) ;not autotested by config + ("podman" ,podman) + ("lua" ,lua) + ("lz4" ,lz4) + ,@(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) slurm-glicid-test diff --git a/glicid/packages/perl.scm b/glicid/packages/perl.scm index e27704c..1fb21aa 100644 --- a/glicid/packages/perl.scm +++ b/glicid/packages/perl.scm @@ -1,28 +1,25 @@ (define-module (glicid packages perl) - #:use-module (guix build-system perl) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix utils) -) + #:use-module (guix build-system perl) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public perl-extutils-embed (package (name "perl-extutils-embed") (version "1.14") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/D/DO/DOUGM/ExtUtils-Embed-" version ".tar.gz")) - (sha256 (base32 "1w55q0wz6i4k9p500mc4wmr8jndnczb6qqrd2m1mrnx13v2mbr7h")) - ) - ) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DO/DOUGM/ExtUtils-Embed-" + version ".tar.gz")) + (sha256 + (base32 + "1w55q0wz6i4k9p500mc4wmr8jndnczb6qqrd2m1mrnx13v2mbr7h")))) (build-system perl-build-system) - (arguments '( - #:tests? #f - )) + (arguments + '(#:tests? #f)) (home-page "https://metacpan.org/release/ExtUtils-Embed") (synopsis "Utilities for embedding Perl in C/C++ applications") (description "Utilities for embedding Perl in C/C++ applications") - (license #f) - ) -) + (license #f))) diff --git a/glicid/packages/python-science.scm b/glicid/packages/python-science.scm index a17f4e9..94e4119 100644 --- a/glicid/packages/python-science.scm +++ b/glicid/packages/python-science.scm @@ -1,16 +1,15 @@ (define-module (glicid packages python-science) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system python) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages python-crypto) - #:use-module (gnu packages python-build) - #:use-module (gnu packages check) - #:use-module (gnu packages geo) - #:use-module (gnu packages python-check) -) - + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system python) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-build) + #:use-module (gnu packages check) + #:use-module (gnu packages geo) + #:use-module (gnu packages python-check)) (define-public python-snuggs (package @@ -50,7 +49,6 @@ ;; un tout petit peu de modifications à faire ici - (define-public python-rasterio (package (name "python-rasterio") diff --git a/glicid/packages/python.scm b/glicid/packages/python.scm index 347548a..301be50 100644 --- a/glicid/packages/python.scm +++ b/glicid/packages/python.scm @@ -1,18 +1,20 @@ (define-module (glicid packages python) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system python)) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system python)) (define-public python-ssh-audit - (package - (name "python-ssh-audit") - (version "2.5.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "ssh-audit" version)) - (sha256 (base32 "1dh5pwa0lhm1a5nvq5abwkqndivk37af5v3a4gj9g6bvpi8zg5rk")))) - (build-system python-build-system) - (home-page "https://github.com/jtesta/ssh-audit") - (synopsis "An SSH server & client configuration security auditing tool") - (description "An SSH server & client configuration security auditing tool") - (license #f))) + (package + (name "python-ssh-audit") + (version "2.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "ssh-audit" version)) + (sha256 + (base32 + "1dh5pwa0lhm1a5nvq5abwkqndivk37af5v3a4gj9g6bvpi8zg5rk")))) + (build-system python-build-system) + (home-page "https://github.com/jtesta/ssh-audit") + (synopsis "An SSH server & client configuration security auditing tool") + (description "An SSH server & client configuration security auditing tool") + (license #f))) diff --git a/glicid/packages/rust.scm b/glicid/packages/rust.scm index a77e968..3dba9bc 100644 --- a/glicid/packages/rust.scm +++ b/glicid/packages/rust.scm @@ -1,11 +1,11 @@ (define-module (glicid packages rust) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system cargo) - #:use-module (gnu packages crates-io) - #:use-module (gnu packages crates-graphics) - #:use-module ((guix licenses) #:prefix license:) -) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system cargo) + #:use-module (gnu packages crates-io) + #:use-module (gnu packages crates-graphics) + #:use-module ((guix licenses) + #:prefix license:)) ; ;(define rust-clippy-0.0.302 rust-clippy-0.0) ;(define rust-unicode-xid-0.0.4 rust-unicode-xid-0.0) diff --git a/glicid/packages/science.scm b/glicid/packages/science.scm index f3c6cde..dff206a 100644 --- a/glicid/packages/science.scm +++ b/glicid/packages/science.scm @@ -1,136 +1,135 @@ (define-module (glicid packages science) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build utils) - #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages qt) - #:use-module (gnu packages gl) - #:use-module (gnu packages boost) - #:use-module (gnu packages algebra) - #:use-module (gnu packages gdb) - #:use-module (gnu packages sqlite) - #:use-module (gnu packages image-processing) - #:use-module (gnu packages graphics) - #:use-module (gnu packages maths) - #:use-module (gnu packages mpi) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages sphinx) - #:use-module (gnu packages commencement) - #:use-module (gnu packages graphviz) - #:use-module (gnu packages multiprecision) - #:use-module (glicid packages mpi) - #:use-module (glicid utils) -) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build utils) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages qt) + #:use-module (gnu packages gl) + #:use-module (gnu packages boost) + #:use-module (gnu packages algebra) + #:use-module (gnu packages gdb) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages image-processing) + #:use-module (gnu packages graphics) + #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages commencement) + #:use-module (gnu packages graphviz) + #:use-module (gnu packages multiprecision) + #:use-module (glicid packages mpi) + #:use-module (glicid utils)) (define-public loki -(package - (name "loki") - (version "0.1.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-" version ".zip")) - (sha256 - (base32 "0p23k4dipk5nnfpvhhqj9apz8rhnd62qdydjmzx8q78sxpwims4w")))) - (build-system gnu-build-system) - (inputs - `(("gcc-toolchain" ,gcc-toolchain))) - (synopsis "Loki is a C++ library of designs, containing flexible implementations of common design patterns and idioms.") - (description - "Loki is the name of a C++ software library written by Andrei Alexandrescu as part of his book Modern C++ Design. - The library makes extensive use of C++ template metaprogramming and implements several commonly used tools: typelist, functor, singleton, smart pointer, object factory, visitor and multimethods.") - (home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage") - (license gpl3+))) - -(define-public yade (package - (name "yade") - (version "2022.01a") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" version ".tar.gz")) - (sha256 - (base32 - "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list "-DENABLE_POTENTIAL_BLOCKS=OFF" - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out")) - (string-append "-DQGLVIEWER_INCLUDE_DIR=" - (assoc-ref %build-inputs "libqglviewer"))) - ;;(string-append "-DQGLVIEWER_INCLUDE_DIR=" - ;;libqglviewer)))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'post-unpack - (lambda* (#:key outputs inputs #:allow-other-keys) - (mkdir-p "./build") - (chdir "./build"))) - (replace 'configure - (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (apply invoke "cmake" "../" configure-flags))))) - #:tests? #f)) - ;;(lambda _ (invoke - ;;"cmake" "../trunk" - ;;configure-flags)))))) - (propagated-inputs - `(("gdb" ,gdb) - ("sqlite" ,sqlite) - ("openmpi" ,openmpi) - ("python" ,python) - ("python-numpy" ,python-numpy) - ("python-matplotlib" ,python-matplotlib) - ("python-sphinx" ,python-sphinx) - ("python-ipython" ,python-ipython) - ("python-mpi4py" ,python-mpi4py) - ("python-mpmath" ,python-mpmath) - ("python-pygraphviz" ,python-pygraphviz) - ("python-xlib" ,python-xlib) - ("python-future" ,python-future) - ("python-pyqt" ,python-pyqt) - ("python-pyqtwebengine" ,python-pyqtwebengine) - ("python-qtpy" ,python-qtpy)) - ) - (inputs - `(("boost" ,boost) - ("qtbase-5",qtbase-5) - ;;("qt" ,qt) - ("freeglut" ,freeglut) - ("gts" ,gts) - ("pkg-config" ,pkg-config) - ("libqglviewer" ,libqglviewer) - ("eigen" ,eigen) - ;;("loki" ,loki) - ;;("vtk" ,vtk) - ("qtwebkit" ,qtwebkit) - ("openblas" ,openblas) - ("suitesparse" ,suitesparse) - ("gcc-toolchain" ,gcc-toolchain) - ("metis" ,metis) - ("cgal" ,cgal) - ("qtsvg" ,qtsvg) - ("qtwebengine" ,qtwebengine) - ("mpfr" ,mpfr)) - ) + (name "loki") + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (string-append + "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-" + version ".zip")) + (sha256 + (base32 + "0p23k4dipk5nnfpvhhqj9apz8rhnd62qdydjmzx8q78sxpwims4w")))) + (build-system gnu-build-system) + (inputs `(("gcc-toolchain" ,gcc-toolchain))) + (synopsis + "Loki is a C++ library of designs, containing flexible implementations of common design patterns and idioms.") + (description + "Loki is the name of a C++ software library written by Andrei Alexandrescu as part of his book Modern C++ Design. + The library makes extensive use of C++ template metaprogramming and implements several commonly used tools: typelist, functor, singleton, smart pointer, object factory, visitor and multimethods.") + (home-page "http://loki-lib.sourceforge.net/index.php?n=Main.HomePage") + (license gpl3+))) - (synopsis "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.") - (description - "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new algorithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.") - (home-page "https://www.yade-dem.org/") - (license gpl3+))) +(define-public yade + (package + (name "yade") + (version "2022.01a") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.com/yade-dev/trunk/-/archive/2022.01a/trunk-" + version ".tar.gz")) + (sha256 + (base32 + "0k4hnvi70cqzl0q54kkbij6jwxydhfwcacp9s49n3fkaf1dihxiv")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENABLE_POTENTIAL_BLOCKS=OFF" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out")) + (string-append "-DQGLVIEWER_INCLUDE_DIR=" + (assoc-ref %build-inputs + "libqglviewer"))) + ;; (string-append "-DQGLVIEWER_INCLUDE_DIR=" + ;; libqglviewer)))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'post-unpack + (lambda* (#:key outputs inputs #:allow-other-keys) + (mkdir-p "./build") + (chdir "./build"))) + (replace 'configure + (lambda* (#:key inputs outputs configure-flags + #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (apply invoke "cmake" "../" configure-flags))))) + #:tests? #f)) + ;; (lambda _ (invoke + ;; "cmake" "../trunk" + ;; configure-flags)))))) + (propagated-inputs `(("gdb" ,gdb) + ("sqlite" ,sqlite) + ("openmpi" ,openmpi) + ("python" ,python) + ("python-numpy" ,python-numpy) + ("python-matplotlib" ,python-matplotlib) + ("python-sphinx" ,python-sphinx) + ("python-ipython" ,python-ipython) + ("python-mpi4py" ,python-mpi4py) + ("python-mpmath" ,python-mpmath) + ("python-pygraphviz" ,python-pygraphviz) + ("python-xlib" ,python-xlib) + ("python-future" ,python-future) + ("python-pyqt" ,python-pyqt) + ("python-pyqtwebengine" ,python-pyqtwebengine) + ("python-qtpy" ,python-qtpy))) + (inputs `(("boost" ,boost) + ("qtbase-5" ,qtbase-5) + ;; ("qt" ,qt) + ("freeglut" ,freeglut) + ("gts" ,gts) + ("pkg-config" ,pkg-config) + ("libqglviewer" ,libqglviewer) + ("eigen" ,eigen) + ;; ("loki" ,loki) + ;; ("vtk" ,vtk) + ("qtwebkit" ,qtwebkit) + ("openblas" ,openblas) + ("suitesparse" ,suitesparse) + ("gcc-toolchain" ,gcc-toolchain) + ("metis" ,metis) + ("cgal" ,cgal) + ("qtsvg" ,qtsvg) + ("qtwebengine" ,qtwebengine) + ("mpfr" ,mpfr))) + + (synopsis + "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method.") + (description + "Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new algorithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.") + (home-page "https://www.yade-dem.org/") + (license gpl3+))) (define-public yade-glicid-waves - (package - (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi) yade) "waves")) - (name "yade-glicid-waves") - ) -) + (package + (inherit (transform-package ((instead-of "openmpi-glicid-waves" openmpi) + yade) "waves")) + (name "yade-glicid-waves"))) diff --git a/glicid/packages/ssh.scm b/glicid/packages/ssh.scm index 6cf22db..7f7a43d 100644 --- a/glicid/packages/ssh.scm +++ b/glicid/packages/ssh.scm @@ -1,97 +1,104 @@ (define-module (glicid packages ssh) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages ssh) - #:use-module (gnu packages hurd) - #:use-module (gnu packages tls) - #:use-module (gnu packages compression) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages linux) - #:use-module (gnu packages security-token) - ) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module ((guix licenses) + #:prefix license:) + #:use-module (gnu packages ssh) + #:use-module (gnu packages hurd) + #:use-module (gnu packages tls) + #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages linux) + #:use-module (gnu packages security-token)) (define-public libcbor-0.8.0 - (package - (name "libcbor") - (version "0.8.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) - (sha256 (base32 "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")))) - (build-system cmake-build-system) - (arguments - `(#:configure-flags (list - "-DCMAKE_CXX_FLAGS=-fPIE" - "-DCMAKE_C_FLAGS=-fPIE" ))) - (synopsis "libfido2") - (description "Todo") - (home-page "toto") - (license license:gpl2+))) + (package + (name "libcbor") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "http://github.com/PJK/libcbor/archive/refs/tags/v" + version ".tar.gz")) + (sha256 + (base32 + "12vw46ahhsc3ydnivkv5lvk1cn4sjjmcr639cjcl99d4dqb9g031")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIE" + "-DCMAKE_C_FLAGS=-fPIE"))) + (synopsis "libfido2") + (description "Todo") + (home-page "toto") + (license license:gpl2+))) (define-public libcbor-0.9.0 - (package - (inherit libcbor-0.8.0) - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://github.com/PJK/libcbor/archive/refs/tags/v" version ".tar.gz")) - (sha256 (base32 "1l8m7h84zwlx088gkz6gvg2fq11g0p3q6lblwba8c01y6gwy90fs")))))) + (package + (inherit libcbor-0.8.0) + (version "0.9.0") + (source (origin + (method url-fetch) + (uri (string-append + "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 - (package - (inherit openssh) - (name "openssh-with-fido2") - (arguments `( - #:test-target "tests" - #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"") - #:configure-flags `( - "--sysconfdir=/etc/ssh" - "--with-default-path=/run/current-system/profile/bin" - ,(string-append "--with-kerberos5=" (assoc-ref %build-inputs "mit-krb5") "/bin") - "--with-libedit" - "--with-security-key-builtin" - ,,@(if (hurd-target?) - '() - '("--with-pam")) - ,,@(if (%current-target-system) - '("--disable-strip") - '())) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'reset-/var/empty - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* - "Makefile" - (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty")) - ) - #t ))) - (add-before 'check 'patch-tests - (lambda _ - (substitute* "regress/test-exec.sh" (("/bin/sh") (which "sh"))) - (substitute* - (list "Makefile" "regress/Makefile") - (("^(tests:.*) t-exec(.*)" all pre post) (string-append pre post))) - #t )) - (replace 'install - (lambda* - ( - #:key outputs (make-flags '()) - #:allow-other-keys - ) - (apply invoke "make" "install-nosysconf" make-flags) - (install-file "contrib/ssh-copy-id" (string-append (assoc-ref outputs "out") "/bin/")) - (chmod (string-append (assoc-ref outputs "out") "/bin/ssh-copy-id") #o555) - (install-file "contrib/ssh-copy-id.1" (string-append (assoc-ref outputs "out") "/share/man/man1/")) - #t ))))) - (inputs `( - ("libfido2", libfido2) - ("libcbor", libcbor) - ,@(package-inputs openssh))))) +(define-public openssh-with-fido2 + ;this is has to be worked again + (package + (inherit openssh) + (name "openssh-with-fido2") + (arguments + `(#:test-target "tests" + #:make-flags '("REGRESSTMP=\"$${BUILDDIR}/regress\"") + #:configure-flags `("--sysconfdir=/etc/ssh" + "--with-default-path=/run/current-system/profile/bin" + ,(string-append "--with-kerberos5=" + (assoc-ref %build-inputs "mit-krb5") + "/bin") + "--with-libedit" + "--with-security-key-builtin" + ,,@(if (hurd-target?) + '() + '("--with-pam")) + ,,@(if (%current-target-system) + '("--disable-strip") + '())) + #:phases (modify-phases %standard-phases + (add-after 'configure 'reset-/var/empty + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("PRIVSEP_PATH=/var/empty") + (string-append "PRIVSEP_PATH=" out "/var/empty"))) + #t))) + (add-before 'check 'patch-tests + (lambda _ + (substitute* "regress/test-exec.sh" + (("/bin/sh") + (which "sh"))) + (substitute* (list "Makefile" "regress/Makefile") + (("^(tests:.*) t-exec(.*)" all pre post) + (string-append pre post))) #t)) + (replace 'install + (lambda* (#:key outputs + (make-flags '()) #:allow-other-keys) + (apply invoke "make" "install-nosysconf" make-flags) + (install-file "contrib/ssh-copy-id" + (string-append (assoc-ref outputs "out") + "/bin/")) + (chmod (string-append (assoc-ref outputs "out") + "/bin/ssh-copy-id") #o555) + (install-file "contrib/ssh-copy-id.1" + (string-append (assoc-ref outputs "out") + "/share/man/man1/")) #t))))) + (inputs `(("libfido2" ,libfido2) + ("libcbor" ,libcbor) + ,@(package-inputs openssh))))) diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm index 2172a50..47050be 100644 --- a/glicid/packages/virtualization.scm +++ b/glicid/packages/virtualization.scm @@ -1,50 +1,51 @@ (define-module (glicid packages virtualization) - #:use-module (guix packages) - #:use-module (guix gexp) - #:use-module (gnu packages) - #:use-module (guix utils) - #:use-module (gnu packages virtualization) - #:use-module (gnu packages storage) - #:use-module (guix download) - #:use-module (glicid utils)) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (gnu packages) + #:use-module (guix utils) + #:use-module (gnu packages virtualization) + #:use-module (gnu packages storage) + #:use-module (guix download) + #:use-module (glicid utils)) -(define-public qemu-latest qemu) -(define-public qemu-minimal-latest qemu-minimal) +(define-public qemu-latest + qemu) +(define-public qemu-minimal-latest + qemu-minimal) (define-public qemu-with-rbd - (package - (inherit qemu-latest) - (name "qemu-with-rbd") - (arguments - (substitute-keyword-arguments - (package-arguments qemu) - ((#:tests? _ #f) - #f))) - (inputs `( - ("ceph:lib", ceph "lib") - ,@(package-inputs qemu))))) + (package + (inherit qemu-latest) + (name "qemu-with-rbd") + (arguments + (substitute-keyword-arguments (package-arguments qemu) + ((#:tests? _ #f) + #f))) + (inputs `(("ceph:lib" ,ceph "lib") + ,@(package-inputs qemu))))) (define-public qemu-minimal-with-rbd - (package - (inherit qemu-minimal-latest) - (name "qemu-minimal-with-rbd") - (arguments - (substitute-keyword-arguments - `( - #:tests? #f - ,@(package-arguments qemu-minimal)))) - (inputs `( - ("ceph:lib", ceph "lib" ) - ,@(package-inputs qemu-minimal))))) + (package + (inherit qemu-minimal-latest) + (name "qemu-minimal-with-rbd") + (arguments + (substitute-keyword-arguments `(#:tests? #f + ,@(package-arguments qemu-minimal)) + )) + (inputs `(("ceph:lib" ,ceph "lib") + ,@(package-inputs qemu-minimal))))) (define-public libvirt-8.5 - (package - (inherit libvirt) - (name "libvirt") - (version "8.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) - (sha256 (base32 "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0")) - (patches (search-patches "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch")))))) + (package + (inherit libvirt) + (name "libvirt") + (version "8.5.0") + (source (origin + (method url-fetch) + (uri (string-append "https://libvirt.org/sources/libvirt-" + version ".tar.xz")) + (sha256 + (base32 + "0qnvjy7k4l52bb5xylvhm21blkgbhld0jzilhsdf6gdqw6srj7j0")) + (patches (search-patches + "glicid/packages/patches/glicid-libvirt-add-install-prefix.patch")))))) diff --git a/glicid/packages/vpn.scm b/glicid/packages/vpn.scm index d447154..d6f4ab1 100644 --- a/glicid/packages/vpn.scm +++ b/glicid/packages/vpn.scm @@ -1,9 +1,8 @@ (define-module (glicid packages vpn) #:use-module (guix packages) - #:use-module ((gnu packages vpn) #:prefix gnu:) - #:use-module (guix download) -) - + #:use-module ((gnu packages vpn) + #:prefix gnu:) + #:use-module (guix download)) ; guix defined openconnect is now newer