From 06e07833496643b5e1f53c476fe3c22d4f654963 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 8 Feb 2023 21:18:19 +0100 Subject: [PATCH 1/3] updating podman to 4.4.0 --- glicid/packages/containers.scm | 242 ++++++++++----------------------- 1 file changed, 73 insertions(+), 169 deletions(-) diff --git a/glicid/packages/containers.scm b/glicid/packages/containers.scm index f8dd3bb..1e94e9b 100644 --- a/glicid/packages/containers.scm +++ b/glicid/packages/containers.scm @@ -1,172 +1,76 @@ (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 git-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 python) + #: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")))) - (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.") - (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)) - (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))))))))) - -(define-public podman-4.3.0 - (package - (inherit podman) - (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")))))) - -;; YD : now uptreamed… - -;(define-public podman-4.2.1 -; (package -; (inherit gnu:podman) -; (name "podman") -; (version "4.2.1") -; (source (origin -; (method url-fetch) -; (uri (list -; (string-append "https://github.com/containers/podman/archive/refs/tags/v" version ".tar.gz") -; )) -; (sha256 (base32 "1wqxiln5p29qq92317m7mllalgk2dy7fqrh48pd2hmcz3blh805i")) -; )) -; ) -;) - -(define-public podman-4.2.0 - (package - (inherit gnu:podman) - (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")))))) - -(define-public podman-4.1.1 - (package - (inherit gnu:podman) - (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")))))) - -(define-public podman-4.1.0 - (package - (inherit gnu:podman) - (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")))))) + (package + (name "podman") + (version "4.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/podman") + (commit (string-append "v" version)))) + (sha256 (base32 "0v1zcb2v7b8k2aw30bws1ir94daw1llc4gfx3rfja25vqhvqw9wk")) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "Makefile" ((".*hack/btrfs.*") "")) + ; we build without doc + (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")))))) + (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 'install 'install-completions + (lambda _ + (invoke "make" "install.completions" + (string-append "PREFIX=" #$output))))))) + (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-1.18 pkg-config python)) + (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.") + (license license:asl2.0))) From 4743ee7bb9069d31916524159a59e5578962bf56 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 8 Feb 2023 22:49:42 +0100 Subject: [PATCH 2/3] updating podman to 4.4.1 --- glicid/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glicid/packages/containers.scm b/glicid/packages/containers.scm index 1e94e9b..1fd118e 100644 --- a/glicid/packages/containers.scm +++ b/glicid/packages/containers.scm @@ -19,14 +19,14 @@ (define-public podman (package (name "podman") - (version "4.4.0") + (version "4.4.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/containers/podman") (commit (string-append "v" version)))) - (sha256 (base32 "0v1zcb2v7b8k2aw30bws1ir94daw1llc4gfx3rfja25vqhvqw9wk")) + (sha256 (base32 "0qbr6rbyig3c2hvdvmd94jjkg820hpdz6j7dgyv62dl6wfwvj5jj")) (modules '((guix build utils))) (snippet '(begin (substitute* "Makefile" ((".*hack/btrfs.*") "")) From 503dd9cb74ab7bac3f870662711456b2f23dbd9f Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Thu, 9 Feb 2023 08:43:53 +0100 Subject: [PATCH 3/3] updating timescaledb --- glicid/packages/databases.scm | 4 +- glicid/packages/linux.scm | 214 ++++++++++++++-------------------- 2 files changed, 91 insertions(+), 127 deletions(-) diff --git a/glicid/packages/databases.scm b/glicid/packages/databases.scm index f094301..e25cf7c 100644 --- a/glicid/packages/databases.scm +++ b/glicid/packages/databases.scm @@ -13,14 +13,14 @@ (define-public timescaledb (package (name "timescaledb") - (version "2.9.2") + (version "2.9.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/timescale/timescaledb") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 "0siijqypx53lkb19y6zz7bx1bnbhk40b5ky5l74ckhv80nlffzfy")))) + (sha256 (base32 "0ybrd1h8cjfhvvld6s1p82jwifmd8grl9abv3626dzx59nrgyjbr")))) (build-system cmake-build-system) (arguments (list #:imported-modules `((guix build union) diff --git a/glicid/packages/linux.scm b/glicid/packages/linux.scm index 9a11f33..c60f3a2 100644 --- a/glicid/packages/linux.scm +++ b/glicid/packages/linux.scm @@ -1,146 +1,110 @@ (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) + #: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-44.0 - (package - (inherit gnu:rdma-core) - (name (string-append (package-name gnu:rdma-core) "-upstream")) - (version "44.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 - "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5")))))) - -(define local-rdma-core - rdma-core-upstream-44.0) - -(define-public rdma-core-latest - (latest-version local-rdma-core gnu:rdma-core)) + (package + (inherit gnu:rdma-core) + (name (string-append (package-name gnu:rdma-core) "-upstream")) + (version "44.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 "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5")))))) +(define local-rdma-core rdma-core-upstream-44.0) +(define-public rdma-core-latest (latest-version local-rdma-core gnu:rdma-core)) (define-public rdma-core-upstream-42.1 - (package - (inherit local-rdma-core) - (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 local-rdma-core) + (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-public libfabric-upstream-1.17.0 - (package - (inherit gnu:libfabric) - (version "1.17.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 - "0pblwkgbnpf40is3isn47andkbm5j7dd8srx9lpwgh1nyrg0z72p")))) - (inputs (modify-inputs (package-inputs gnu:libfabric) - (prepend `(,util-linux "lib") - ;; uuid.h, numa.h - gnu:numactl))))) + (package + (inherit gnu:libfabric) + (version "1.17.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 "0pblwkgbnpf40is3isn47andkbm5j7dd8srx9lpwgh1nyrg0z72p")))) + (inputs (modify-inputs (package-inputs gnu:libfabric) + (prepend `(,util-linux "lib") gnu:numactl))))) -(define local-libfabric - libfabric-upstream-1.17.0) +(define local-libfabric libfabric-upstream-1.17.0) -(define-public libfabric-latest - (latest-version local-libfabric gnu:libfabric)) +(define-public libfabric-latest (latest-version local-libfabric gnu:libfabric)) (define-public libfabric-upstream-1.16.1 - (package - (inherit local-libfabric) - (version "1.16.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ofiwg/libfabric/releases/download/v" - version "/libfabric-" version ".tar.bz2")) - (sha256 - (base32 - "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")))))) + (package + (inherit local-libfabric) + (version "1.16.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) + (sha256 (base32 "0gqr7765za14kalwws2brw8l6zw80iai0ggaljw99zls7z9r5yak")))))) (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 psm2-upstream-11.2.228 - (package - (inherit local-psm2) - (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 "local-psm2" version)) - (sha256 - (base32 - "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz")))))) - + (package + (inherit local-psm2) + (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 "local-psm2" version)) + (sha256 (base32 "1yymw4rkpdkzyi0lglagncjg1az2qmnq6f3lgrkvs6y77l9z6wrz")))))) (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.95.2") + (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 "108fr056zmbipiv1nsrjccn3ky0jbcwan43big34nyq1c9dqjq1x"))))))