diff options
author | Tomas Volf <~@wolfsden.cz> | 2024-02-16 22:14:27 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2024-03-02 17:23:26 +0100 |
commit | 6f5ea7ac1acb3d1c53baf7620cca66cc87fe5a73 (patch) | |
tree | 128677acaf2d4e7cb49abce392de07e298b317bd /gnu/packages/containers.scm | |
parent | 61694dc1cd8888adab34841171fc098d9d206dfe (diff) | |
download | guix-6f5ea7ac1acb3d1c53baf7620cca66cc87fe5a73.tar.gz guix-6f5ea7ac1acb3d1c53baf7620cca66cc87fe5a73.zip |
gnu: podman: Update to 4.9.3.
* gnu/packages/containers.scm (podman): Update to 4.9.3.
* gnu/packages/patches/podman-program-lookup.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: If764e8456a697d16b76cd4ba1243cc5f633a6049
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/containers.scm')
-rw-r--r-- | gnu/packages/containers.scm | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 5b79e8a446..aa270a25f3 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -342,7 +342,7 @@ configure network interfaces in Linux containers.") (define-public podman (package (name "podman") - (version "4.4.1") + (version "4.9.3") (source (origin (method git-fetch) @@ -353,8 +353,11 @@ configure network interfaces in Linux containers.") ;; FIXME: Btrfs libraries not detected by these scripts. (snippet '(substitute* "Makefile" ((".*hack/btrfs.*") ""))) + (patches + (search-patches + "podman-program-lookup.patch")) (sha256 - (base32 "0qbr6rbyig3c2hvdvmd94jjkg820hpdz6j7dgyv62dl6wfwvj5jj")) + (base32 "17g7n09ndxhpjr39s9qwxdcv08wavjj0g5nmnrvrkz2wgdqigl1x")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -381,10 +384,11 @@ configure network interfaces in Linux containers.") (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* "vendor/github.com/containers/common/pkg/config/config.go" + (("@SLIRP4NETNS_DIR@") + (string-append #$slirp4netns "/bin")) + (("@PASST_DIR@") + (string-append #$passt "/bin"))) (substitute* "hack/install_catatonit.sh" (("CATATONIT_PATH=\"[^\"]+\"") (string-append "CATATONIT_PATH=" (which "true")))) @@ -414,11 +418,12 @@ configure network interfaces in Linux containers.") libassuan libseccomp libselinux + passt slirp4netns)) (native-inputs (list bats git - go-1.19 + go-1.21 ; strace ; XXX debug pkg-config python)) @@ -427,7 +432,10 @@ configure network interfaces in Linux 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.") +containers. + +The @code{machine} subcommand is not supported due to gvproxy not being +packaged.") (license license:asl2.0))) (define-public buildah |