diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/containers.scm | |
parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/containers.scm')
-rw-r--r-- | gnu/packages/containers.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 59eea423a1..985dea7bdb 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -91,7 +91,7 @@ (inputs (list libcap libseccomp - libyajl)) + yajl)) (native-inputs (list automake autoconf @@ -274,7 +274,7 @@ configure network interfaces in Linux containers.") (define-public podman (package (name "podman") - (version "4.2.1") + (version "4.3.1") (source (origin (method git-fetch) @@ -282,7 +282,7 @@ configure network interfaces in Linux containers.") (url "https://github.com/containers/podman") (commit (string-append "v" version)))) (sha256 - (base32 "0ph8gf5gk9z1hm1v5kv924dipswvgrz0sgk23plnh2q0vbnh4wvv")) + (base32 "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -346,7 +346,8 @@ configure network interfaces in Linux containers.") git go ; strace ; XXX debug - pkg-config)) + pkg-config + python)) (home-page "https://podman.io") (synopsis "Manage containers, images, pods, and their volumes") (description |