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

Merge branch 'devel' into 'main'

Browse source 
Devel

See merge request glicid-public/guix-glicid!207
This commit is contained in:
Jean-François GUILLAUME 2023-02-08 20:20:11 +00:00
commit 40ca7ebef2
1 changed files with 73 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

170
glicid/packages/containers.scm
View file

@ -1,16 +1,16 @@
(define-module (glicid packages containers) (define-module (glicid packages containers)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:prefix license:) #:use-module ((gnu packages containers) #:prefix gnu:)
#:use-module ((gnu packages containers)
#:prefix gnu:)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages python)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (guix utils) #:use-module (guix utils)
@ -19,41 +19,30 @@
(define-public podman (define-public podman
(package (package
(name "podman") (name "podman")
(version "4.3.1") (version "4.4.0")
(source (origin (source
(method url-fetch) (origin
(uri (list (string-append (method git-fetch)
"https://github.com/containers/podman/archive/refs/tags/v" (uri (git-reference
version ".tar.gz"))) (url "https://github.com/containers/podman")
(sha256 (commit (string-append "v" version))))
(base32 (sha256 (base32 "0v1zcb2v7b8k2aw30bws1ir94daw1llc4gfx3rfja25vqhvqw9wk"))
"04w8lwybsxix4ms6gnsj2xp4xkm567fj0vnlwmjn7kbqxv22jp25")))) (modules '((guix build utils)))
(home-page "https://podman.io") (snippet '(begin
(synopsis "Manage containers, images, pods, and their volumes") (substitute* "Makefile" ((".*hack/btrfs.*") ""))
(description ; we build without doc
"Podman (the POD MANager) is a tool for managing containers and images, volumes mounted into those containers, and pods made from groups of containers.") (substitute* "Makefile" (("all: binaries docs") "all: binaries"))
(license license:asl2.0) (substitute* "Makefile" (("install: install.bin install.remote install.man install.systemd") "install: install.bin install.remote install.systemd"))))))
(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) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags #~(list #$(string-append "CC=" (list
(cc-for-target)) #:make-flags
(string-append "PREFIX=" #~(list #$(string-append "CC=" (cc-for-target))
#$output)) (string-append "PREFIX=" #$output))
#:tests? #f #:tests? #f
#:test-target "test" #:test-target "test"
#:phases #~(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -66,107 +55,22 @@
(add-after 'unpack 'fix-hardcoded-paths (add-after 'unpack 'fix-hardcoded-paths
(lambda _ (lambda _
(substitute* (find-files "libpod" "\\.go") (substitute* (find-files "libpod" "\\.go")
(("exec.LookPath[(][\"]slirp4netns[\"][)]") (("exec.LookPath[(][\"]slirp4netns[\"][)]") (string-append "exec.LookPath(\"" (which "slirp4netns") "\")")))
(string-append "exec.LookPath(\""
(which "slirp4netns") "\")")))
(substitute* "hack/install_catatonit.sh" (substitute* "hack/install_catatonit.sh"
(("CATATONIT_PATH=\"[^\"]+\"") (("CATATONIT_PATH=\"[^\"]+\"") (string-append "CATATONIT_PATH=" (which "true"))))
(string-append "CATATONIT_PATH="
(which "true"))))
(substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go" (substitute* "vendor/github.com/containers/common/pkg/config/config_linux.go"
(("/usr/local/libexec/podman") (("/usr/local/libexec/podman") (string-append #$output "/bin")))
(string-append #$output "/bin")))
(substitute* "vendor/github.com/containers/common/pkg/config/default.go" (substitute* "vendor/github.com/containers/common/pkg/config/default.go"
(("/usr/libexec/podman/conmon") (("/usr/libexec/podman/conmon") (which "conmon"))
(which "conmon")) (("/usr/local/libexec/cni") (string-append #$(this-package-input "cni-plugins") "/bin"))
(("/usr/local/libexec/cni") (("/usr/bin/crun") (which "crun")))))
(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 (add-after 'install 'install-completions
(lambda _ (lambda _
(invoke "make" "install.completions" (invoke "make" "install.completions"
(string-append "PREFIX=" (string-append "PREFIX=" #$output)))))))
#$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))
(define-public podman-4.3.0 (home-page "https://podman.io")
(package (synopsis "Manage containers, images, pods, and their volumes")
(inherit podman) (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.")
(name "podman") (license license:asl2.0)))
(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"))))))