diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/containers.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/containers.scm')
| -rw-r--r-- | gnu/packages/containers.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 3982f4f059..b402bbde6a 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -176,7 +176,7 @@ runtime (like runc or crun) for a single container.") #~(modify-phases %standard-phases (add-before 'install 'refer-to-inputs (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "^distrobox.*") + (substitute* (find-files "." "^distrobox.*[^1]$") (("podman") (search-input-file inputs "/bin/podman")) (("wget") (search-input-file inputs "/bin/wget")) (("command -v") "test -x")))) @@ -311,7 +311,7 @@ configure network interfaces in Linux containers.") (define-public podman (package (name "podman") - (version "4.3.1") + (version "4.4.1") (source (origin (method git-fetch) @@ -323,7 +323,7 @@ configure network interfaces in Linux containers.") (snippet '(substitute* "Makefile" ((".*hack/btrfs.*") ""))) (sha256 - (base32 "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h")) + (base32 "0qbr6rbyig3c2hvdvmd94jjkg820hpdz6j7dgyv62dl6wfwvj5jj")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -385,7 +385,7 @@ configure network interfaces in Linux containers.") (native-inputs (list bats git - go + go-1.19 ; strace ; XXX debug pkg-config python)) |