From patchwork Sun Mar 31 18:34:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62392 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B4F2F27BBE2; Sun, 31 Mar 2024 19:36:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0AEAB27BBEA for ; Sun, 31 Mar 2024 19:36:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02J-0001Cl-QB; Sun, 31 Mar 2024 14:36:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02F-0001Bn-D4 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02F-00081Q-3u for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02H-00020F-AY for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 01/11] gnu: crun: Update to 1.14.4. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101267460 (code B ref 70112); Sun, 31 Mar 2024 18:36:05 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:26 +0000 Received: from localhost ([127.0.0.1]:48407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01d-0001w2-8O for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:40168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01Z-0001uu-3R for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 67F6F2A04B0; Sun, 31 Mar 2024 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910117; bh=pkNLUiaJzTRsLaYBt4mNRPhdpZWocpn1PaiEec48ZHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZPnBiBgxtuJZ6OFkrpnfYi3LdaMo335MpBl7WRUkkn2q+0pCb1PuXFjXKM0mWytA8 hpQxJdUtreHmR1Cu8f4vGAvMS4zo+UAbZ452xpmb0Uj0O5sEhBC5auZ5tRlAUJs3Q4 0qKZipm8nDhlfeArzDPosc0HvnLxHv+6KV4aSvBe1Uw8sshm0iISwzeJbJMF6pffeH E/h/U118bsk2tHg9EKHb6WQw9EX8d3RXUX83hPiJkJ/8QPAiwydkWO2PJd7yQ7AHlA nxZgnqS3ZDb0JxRCiRsOTzpSlmuRFM5cYtj/ypLgDA0r3LOsi4bu1/if/f55jkwCag Dn/swz1P3ewKGx1LMDp/XC2sF5yRwNtpPJqLksbBa39dkyq6eVeEBlxPglOSmwswNc 60jUBm4JDPLJAhqVXHNcFbxZjpWTvL1+3iSUXfymJ0iUVB+krMr0gzUufZImxAvGlK VxjIaJVv1rKRpHTGsOnMtFXMUVhf7ORrjLFk1Vkc3fxc+Tr6tMu9Ofp/5bIzK4H9Lq GJCNH/a/kbhYL8AIDWU9Eg+EDqb2y9dYrr8+5RzeRMQZEUnY+Kcbss2qfukEHe2wiu Qf/MtHs2DoQSMlZKI8HxJ+Kv34cdK2iCtar7hOEG7bEs6svkSDL5HA4YVfqNq7g7Lj o2QI5oYh0XcG1Xfn7IhsNBdQ= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 0F9852A04AF; Sun, 31 Mar 2024 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910117; bh=pkNLUiaJzTRsLaYBt4mNRPhdpZWocpn1PaiEec48ZHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZPnBiBgxtuJZ6OFkrpnfYi3LdaMo335MpBl7WRUkkn2q+0pCb1PuXFjXKM0mWytA8 hpQxJdUtreHmR1Cu8f4vGAvMS4zo+UAbZ452xpmb0Uj0O5sEhBC5auZ5tRlAUJs3Q4 0qKZipm8nDhlfeArzDPosc0HvnLxHv+6KV4aSvBe1Uw8sshm0iISwzeJbJMF6pffeH E/h/U118bsk2tHg9EKHb6WQw9EX8d3RXUX83hPiJkJ/8QPAiwydkWO2PJd7yQ7AHlA nxZgnqS3ZDb0JxRCiRsOTzpSlmuRFM5cYtj/ypLgDA0r3LOsi4bu1/if/f55jkwCag Dn/swz1P3ewKGx1LMDp/XC2sF5yRwNtpPJqLksbBa39dkyq6eVeEBlxPglOSmwswNc 60jUBm4JDPLJAhqVXHNcFbxZjpWTvL1+3iSUXfymJ0iUVB+krMr0gzUufZImxAvGlK VxjIaJVv1rKRpHTGsOnMtFXMUVhf7ORrjLFk1Vkc3fxc+Tr6tMu9Ofp/5bIzK4H9Lq GJCNH/a/kbhYL8AIDWU9Eg+EDqb2y9dYrr8+5RzeRMQZEUnY+Kcbss2qfukEHe2wiu Qf/MtHs2DoQSMlZKI8HxJ+Kv34cdK2iCtar7hOEG7bEs6svkSDL5HA4YVfqNq7g7Lj o2QI5oYh0XcG1Xfn7IhsNBdQ= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:34:58 +0200 Message-ID: <160eb0e97e1f079ba6a20e2336b1cb5704622536.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (crun): Update to 1.14.4. Change-Id: I769c15663bf668a967cf32243dd8139b6c949953 --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 31260c5c0a..f1b76f8512 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -58,7 +58,7 @@ (define-module (gnu packages containers) (define-public crun (package (name "crun") - (version "1.14.1") + (version "1.14.4") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public crun "/crun-" version ".tar.gz")) (sha256 (base32 - "02lplc2asyllb58mvy7l8b9gsk7fxs95g928xk28yzmf592ay33x")))) + "1d7fjhajf3bg576fzz96yi1djdqqs12bbhzv8br02h5czlxh29sm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-systemd") From patchwork Sun Mar 31 18:34:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62389 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8303227BBEA; Sun, 31 Mar 2024 19:36:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2C54B27BBE2 for ; Sun, 31 Mar 2024 19:36:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02H-0001CZ-Qh; Sun, 31 Mar 2024 14:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02E-0001BZ-1e for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02D-00081J-PT for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02G-000206-Ba for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 02/11] gnu: podman: Drop obsolete comment. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101257445 (code B ref 70112); Sun, 31 Mar 2024 18:36:04 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:25 +0000 Received: from localhost ([127.0.0.1]:48402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01c-0001vz-TH for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:25 -0400 Received: from wolfsden.cz ([37.205.8.62]:40178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01Z-0001vA-IC for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 438E42A08B4; Sun, 31 Mar 2024 18:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910118; bh=n/iGokKMBCXXwXHtj+Yy8/NqE/Gh+x4Fg/ktVfwoChI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hQNEeDq1RplP7iQGwVSM/yMVOYjJCAZKRyXKraW49lg+CzbI2mnAOVdu4f6p2cH3n QvtghDhZh/XhnT/3Ri4nNj0AoqDLfspPAtV8EXPpwJ2YaIfd2LgXWwjJKrEoHNzkKF iKUTooh+1aoL6mZkjAPQxTeJMC/rG69eaipxyZFG7bAFyiykL+RqDpjAh5p7YHZO5s PrYxDMPM6mGXB5cqiRXqJ83tDC5ZH6nF2xCyTORW0VFdzTQXLoDFq5/h57xhIJ4LWe 3TY6XSLEUf6ZX0BSeR2IjlyngkMtc7eM0gtCYh90ah8KxhS5KgH06O5uMp0sXlAGR3 gbdWmYn1Ie5yMnHkOpUGEpN4Urp5ZRCmXtyJF/0RuR+gzUWtx9nIXagCaWnJO2Kjb+ Wl1Q90MiWSNvYkhfuZc1kNaobGsyCdpRHw1tTKnntsnA77gIx2yIEHQEGznqprtM8q 3WSp5bQM/Jtlf6LYewtcEskGpJGyXXzEP4l7AuCfcq3q+LjKdTf6FHCJfSLYnDgz0S 5icru+Zwq4X86XXPUgwVEXYDuxszlYq2lNel2pyfIpBb7uGAEBixUoAM/roFEgCL28 go+RLZAhOYotlHCa5U228cnFGI36MS0cjdWjnvhIv8m8Dct0zr+rZ85PO87eucRpFx 4cFG3vSdFVWmeac55Urc6KA4= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id F222B2A08B3; Sun, 31 Mar 2024 18:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910118; bh=n/iGokKMBCXXwXHtj+Yy8/NqE/Gh+x4Fg/ktVfwoChI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hQNEeDq1RplP7iQGwVSM/yMVOYjJCAZKRyXKraW49lg+CzbI2mnAOVdu4f6p2cH3n QvtghDhZh/XhnT/3Ri4nNj0AoqDLfspPAtV8EXPpwJ2YaIfd2LgXWwjJKrEoHNzkKF iKUTooh+1aoL6mZkjAPQxTeJMC/rG69eaipxyZFG7bAFyiykL+RqDpjAh5p7YHZO5s PrYxDMPM6mGXB5cqiRXqJ83tDC5ZH6nF2xCyTORW0VFdzTQXLoDFq5/h57xhIJ4LWe 3TY6XSLEUf6ZX0BSeR2IjlyngkMtc7eM0gtCYh90ah8KxhS5KgH06O5uMp0sXlAGR3 gbdWmYn1Ie5yMnHkOpUGEpN4Urp5ZRCmXtyJF/0RuR+gzUWtx9nIXagCaWnJO2Kjb+ Wl1Q90MiWSNvYkhfuZc1kNaobGsyCdpRHw1tTKnntsnA77gIx2yIEHQEGznqprtM8q 3WSp5bQM/Jtlf6LYewtcEskGpJGyXXzEP4l7AuCfcq3q+LjKdTf6FHCJfSLYnDgz0S 5icru+Zwq4X86XXPUgwVEXYDuxszlYq2lNel2pyfIpBb7uGAEBixUoAM/roFEgCL28 go+RLZAhOYotlHCa5U228cnFGI36MS0cjdWjnvhIv8m8Dct0zr+rZ85PO87eucRpFx 4cFG3vSdFVWmeac55Urc6KA4= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:34:59 +0200 Message-ID: <286152c31974061c0783ef711489b25c0273cfa8.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches cgroup2 is now the default type. * gnu/packages/containers.scm (podman): Drop the comment. Change-Id: I197ed7e4901b26ad820295ed7adcaffd7bf533f5 --- gnu/packages/containers.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index f1b76f8512..b08d0ee762 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -410,9 +410,6 @@ (define-public gvisor-tap-vsock The binary is called @command{gvproxy}.") (license license:asl2.0))) -;; For podman to work, the user needs to run -;; `sudo mount -t cgroup2 none /sys/fs/cgroup` - (define-public podman (package (name "podman") From patchwork Sun Mar 31 18:35:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62397 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA9D927BBEA; Sun, 31 Mar 2024 19:36:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 95CF127BBE2 for ; Sun, 31 Mar 2024 19:36:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02K-0001DX-H1; Sun, 31 Mar 2024 14:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02F-0001Bo-LD for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02F-00081Y-Cl for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02H-00020M-R3 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 03/11] gnu: podman: Update to 5.0.0. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101267468 (code B ref 70112); Sun, 31 Mar 2024 18:36:05 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:26 +0000 Received: from localhost ([127.0.0.1]:48412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01d-0001wD-Sd for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:26 -0400 Received: from wolfsden.cz ([37.205.8.62]:40188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01a-0001vN-HO for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:23 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 3CA1C29EFFA; Sun, 31 Mar 2024 18:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910119; bh=lJEZPhGOzY7vlKCxjEuNUTxMZpxKSde0j8Sayqmy0r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KmyWdduNmQ58tnMUhmCzPckIces+QtIDHzo2Q87AABLH8WLaMoIF0AEz8kyFUl8v+ dLOj/LOmm6DuYzS/CNdZL/X93AeOry3NCrHfYeROCIOfdxULiPGTdo7FkSZvvetCyV PgSIFfYBUsyLsRFFMp7cPPzYwUxqcev8MYGYjXMPVUxNuYQy+Aqq6EsCoxDJNRSCqD ssEK8TOb6VFfJXXQvoyH/HU55lhJ8YkuQ1aLxBOEqcj/LQrLNPWppkTUTM2dmQfS3Y giVXRkvNijwO329Y3QrZFphZBkCQKBmEsFu8VWkmKqplBeHZOCidHAog3kWonKFTwT UBQ3QKgz4PzT78M0v/Rk65ZEnIXFs3Q/zUPcep8i8PQUDJNGZWo3uXXY8SQnghm72S abZz1vcsey2r/TzvInSx03LziBeDKDSUQR9V5OktAY12mzDVDhj3OGmbCvi8i9qEOW EFGyenGiIktG0aS6tSZ3GVUOf1SW7erdDLu8pOQMTf7FDccxgte97hGOhY+HtL7Fjs lO2L5zXnnPJ+tLY29jwLuJiY1y7uxg6TghCeVrpA5kQRtacwC052Or/5L6VJNHYlvI ZmjniQ4hERsTgzzxUIFQk3jj23dp95Fq9BTZzWk9reJ6aI8UtPFBV0iCjXB9a50lZa 9lqsjijGCGzmvaWbHACma7Kc= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id E24AB2A0F81; Sun, 31 Mar 2024 18:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910119; bh=lJEZPhGOzY7vlKCxjEuNUTxMZpxKSde0j8Sayqmy0r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KmyWdduNmQ58tnMUhmCzPckIces+QtIDHzo2Q87AABLH8WLaMoIF0AEz8kyFUl8v+ dLOj/LOmm6DuYzS/CNdZL/X93AeOry3NCrHfYeROCIOfdxULiPGTdo7FkSZvvetCyV PgSIFfYBUsyLsRFFMp7cPPzYwUxqcev8MYGYjXMPVUxNuYQy+Aqq6EsCoxDJNRSCqD ssEK8TOb6VFfJXXQvoyH/HU55lhJ8YkuQ1aLxBOEqcj/LQrLNPWppkTUTM2dmQfS3Y giVXRkvNijwO329Y3QrZFphZBkCQKBmEsFu8VWkmKqplBeHZOCidHAog3kWonKFTwT UBQ3QKgz4PzT78M0v/Rk65ZEnIXFs3Q/zUPcep8i8PQUDJNGZWo3uXXY8SQnghm72S abZz1vcsey2r/TzvInSx03LziBeDKDSUQR9V5OktAY12mzDVDhj3OGmbCvi8i9qEOW EFGyenGiIktG0aS6tSZ3GVUOf1SW7erdDLu8pOQMTf7FDccxgte97hGOhY+HtL7Fjs lO2L5zXnnPJ+tLY29jwLuJiY1y7uxg6TghCeVrpA5kQRtacwC052Or/5L6VJNHYlvI ZmjniQ4hERsTgzzxUIFQk3jj23dp95Fq9BTZzWk9reJ6aI8UtPFBV0iCjXB9a50lZa 9lqsjijGCGzmvaWbHACma7Kc= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:00 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (podman): Update to 5.0.0. Change-Id: Id12c017e68f30db4ea99547beca54dbd01e3b029 --- gnu/packages/containers.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index b08d0ee762..f62e4017dc 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -49,6 +49,7 @@ (define-module (gnu packages containers) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages selinux) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) @@ -413,7 +414,7 @@ (define-public gvisor-tap-vsock (define-public podman (package (name "podman") - (version "4.9.3") + (version "5.0.0") (source (origin (method git-fetch) @@ -428,7 +429,7 @@ (define-public podman (search-patches "podman-program-lookup.patch")) (sha256 - (base32 "17g7n09ndxhpjr39s9qwxdcv08wavjj0g5nmnrvrkz2wgdqigl1x")) + (base32 "0g15m10mgwssw5axkyn2ms5k858dbc6vf3cbxv7hvdncgwnfk5f0")) (file-name (git-file-name name version)))) (build-system gnu-build-system) @@ -459,7 +460,9 @@ (define-public podman (("@SLIRP4NETNS_DIR@") (string-append #$slirp4netns "/bin")) (("@PASST_DIR@") - (string-append #$passt "/bin"))) + (string-append #$passt "/bin")) + (("@NETAVARK_DIR@") + (string-append #$netavark "/bin"))) (substitute* "hack/install_catatonit.sh" (("CATATONIT_PATH=\"[^\"]+\"") (string-append "CATATONIT_PATH=" (which "true")))) From patchwork Sun Mar 31 18:35:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62393 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ACE5327BBEA; Sun, 31 Mar 2024 19:36:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E1D627BBE2 for ; Sun, 31 Mar 2024 19:36:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02J-0001D1-SR; Sun, 31 Mar 2024 14:36:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02G-0001Bp-1S for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02F-00081f-PL for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02I-00020Y-E7 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 04/11] gnu: conmon: Update to 2.1.10. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101277481 (code B ref 70112); Sun, 31 Mar 2024 18:36:06 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:27 +0000 Received: from localhost ([127.0.0.1]:48414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01e-0001wO-HF for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:26 -0400 Received: from wolfsden.cz ([37.205.8.62]:40202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01b-0001vh-Gw for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:23 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 3AD372A086F; Sun, 31 Mar 2024 18:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910120; bh=YaefCbYRrcXwnbwhAtU0AizfXAXJw1wCM54uuyZaJrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bWqRVMBdXEbjY7ihQ+nLfXwGHOmQOg+b9p0x1IfBT+gj1jeUGKxGiGsk6ttry7yj3 OjxSLv8fGsT+abd3E/mXAfwYWiEEDXql8Ni0z8Wo8YlO5t5ul/+Y1vKyfWp9p7zCkz 1IKHBbWnmO5Ua36ptcvMLt7t9KaZgd0RhAnrY1VeBXfUBPmR6oc/i8sTJOwjAnthZh Fo2Ty8hLSLak4U7CQBu0D7Rg8V8TOeXRweeND0TuKyIS0ON34sk0vfYZTfM43CWiov vq1RQcXwyeXgiOOaNRc2dOJ9cbt4mumiRrx+pe9cePdDoSRWGjP2cOc5k941vt7g/l vi+XD2Ob0jX/EM5q6ky92tk08b/Ylmc8AoQ1XPXcgetFZgyeC6EdMrh3utWIGxGCK+ paTkPC3gpd4adox9/6/mFHW4JT1MfSvYtPcmE7I59wJWcPlq4rNA7JfH3IKp7jiP/0 fbYtTzsak01xWqjeGb9bd26AqA/pFkrxY9iBGmBm96ADP54wkNKkYganW3SKRRdPj9 Wu913MBKpHuBxOO7aqychHVPEdkt/F1V4p/qq646V8HIcNk7lX3yuMVgBeTihuReky 8kaha6Spa2eNInlVVXG/4xPMP/MsCvHU77WjXxYoibB82kCd23tYWd6ZGhZL9AX4XR TuTboZdHcxeAiH4+/TVFMnBA= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id D0D6F2A01BB; Sun, 31 Mar 2024 18:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910119; bh=YaefCbYRrcXwnbwhAtU0AizfXAXJw1wCM54uuyZaJrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=clmgo34U+nP3WkWAGFpUYqRd0XAD2YAsok7QKMFJ2iZ7aDpNoj4+0R0uSMIY+96VO TdB42tUZc9PAudKBhT7sY56syr3LVvJrsWyI10+pK0CfwmBNJ9wIjq+bsbVWuizWDj FPJEvaZgn62QeQBeakkepScvIekeW8NKo8zWjIzBsam+DcsTwt02hYANehm/+MQKEG QYkXM/YD3Gqe1ZdZQy3NlwHKCdcCCwfNDVQFuZkcczvGgyYB9L0fyVyFmU7mheUD3x 2WVfyari3DFiyHP+0RShok5A0q6uY3lHiZmOk7ypmI6+lISVmSjcnGpxww8o+sJN5p mCX0tI7zk2ligYQSY78pbGSW2MwyvEcZp6R7wkEqfzRBrsM+ejZ+XppmGBQhm79BB0 /6ZRu4uR5sqIUxKeg9CR5GE4SMInGLupSmJnGC1LyDyuFXzyb78cAEeW1GCCGAE6My lrx9e74d1OGrRTxaPH7L8Zlm4y1eXx5JudpoHGvsdPxW+YhaeM+9+7WPhWH9jSfc1N tnn+05ilksJP88UgmyX/U5CuTO2qttP5BWfts1rs3dj47/K8sSDy8nCtLFlpPyNOHt /+SIzQ8aRDMZcswfvqd+G3iWJh0zvIw91SGbmX+MY+qdX5tyy9OlmQk7cdUoyvJvGo o27Oh6Oc1x2m/iPElLA/Q0TA= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:01 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (conmon): Update to 2.1.10. Change-Id: I2a46b2dcd344909da34199145fef4ad3fa4418de --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index f62e4017dc..9e3ba8918e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -105,7 +105,7 @@ (define-public crun (define-public conmon (package (name "conmon") - (version "2.0.31") + (version "2.1.10") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ (define-public conmon (url "https://github.com/containers/conmon") (commit (string-append "v" version)))) (sha256 - (base32 "1cxklcihb2i4ywli0fxafkp2gi1x831r37z7spnigaj6pzj1517w")) + (base32 "0q4kn54pfgq1c2h00hkidagxrynkgq9nmm1ikgd9084njg3z4iar")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments From patchwork Sun Mar 31 18:35:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62394 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5C17327BBEC; Sun, 31 Mar 2024 19:36:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DD6F727BBE2 for ; Sun, 31 Mar 2024 19:36:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02K-0001Dt-Lf; Sun, 31 Mar 2024 14:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02G-0001Bq-FI for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02G-00081l-6z for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02I-00020h-Rb for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 05/11] gnu: passt: Update to 2024_03_20.71dd405. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101437581 (code B ref 70112); Sun, 31 Mar 2024 18:36:06 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:43 +0000 Received: from localhost ([127.0.0.1]:48432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01u-0001yB-01 for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:42 -0400 Received: from wolfsden.cz ([37.205.8.62]:40204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01d-0001vw-00 for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:25 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B144B2A0D03; Sun, 31 Mar 2024 18:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910121; bh=FRxuRJ+DR9um26p43p/AS3tSF4F5Q78R1DoeMI+Fjus=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IZp3oHfASIhTEjKGbh/hg9Y7KxrrpNXyyvqTl6wGari/+qdN9+sTdh3wmxN2wXRwh T0g7a5v0xWdh0FnNnlcbZ136fMyLy3KeT9yEHHs/tr0ezRXUfkFn0D7zKCrEH+1T4/ ux2qOLvhGFX7NpWF+LLnFqQbELUrfVqaMitZq1BKZM4L0RGZ8EOGMRldSI4it8LZyd Z5EzvN90ijJ6iCk84RE0N3gtGhIibBqoFWenSJDqvsciyyP5N5ETd7sjaH1sNZGnto rR6QYViq0UBPvmN64oqMv6dqkw3lW+au0JzaXke8fWNDp/N72tbx5eZH2WK01oZZpf vKkjGsruGVadeDv48u1SxpSTlheYsV0RoxiWp6M6z39JzNPBMBG0krvA4Q3ia9n3mD yExDmz0o95wnlQ4NrscROTEqwVUsJklVifQCLSYpyDKiFZkOJn0x5Bh7FEGhKHQYRx FHv2Bg43pQ6FjGHQDl8Thkf42IlHmsDgjKf94d6gi5CvT0susk7b8t+T5M+HsY+p+c /JYZGE4F61wAYUq1W9qxCUE0IgF+IH4TPD2lyybHqgKp/wDs64uHat2P1ForTUDE4T 45Ro/ev4d8+N4z3tUgjR/mmvoZEBHfkd4YO7wUbJ9LAQJ4kTFUM7Cum/ZrXS70H8Bn ivFUCs7mqrNXS5YQPjlMVJeo= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id C13F92A006C; Sun, 31 Mar 2024 18:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910120; bh=FRxuRJ+DR9um26p43p/AS3tSF4F5Q78R1DoeMI+Fjus=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xq5l3LcphFdq7pQ9AG55k0+tdlfrAJP1eCACrdy4K3qVQpJ4tEn7pqs0DUtXtfkuA 2bEVA3TgFemy/UP70QF5rl9vbaIAaAXLgKDQMh2+kBCdgTKikrpDCPYrVKb0NaRCr+ b/dLlQUCj2Ksxy80Cz96iME/MOrUVyTDhK4gKDORI8YD0QQizDe1HKp3k6w/VyUQB5 1roU07FQIEDGECbSQGJeyZk6hiH/l09FAxSZIUVdatEO4lVaqE4A6TLQ9LxZxUxzMh Tb8RmGyQP2z7uAmH+9pqzsemI5xCnhGbk2j53rlOn8Woz4tQwtbLwUcvI6G+kXfo5v PcGcajsnLHvj0er3zOXAkmhV+Ko1504YtEcuDp8suBt7f+aDUdy6YSTVDTEKkx0cQR MDLD7aGVek+bDZa2tQZibRpuXSn2+uA4rMYjZ3S+3Q/3RWAOOWeUeJjopwVtTj5QDj RcKKzjUCy9ZhiwUlVVJGhtNqDPPLFBEHSRdD5214X8nH526KNvgjHgE4F4FaDopnGo MV2mlRASuQgUXinNAypK8ZToZTbzttby69dGvXB1Lr7ki8n46TIkMij1tn5ijNtmNb +qaJVML0bswPNJhsqINYupFg4sUyjGtugsJvkwa1M2TTCKgiqRfIG3cM3Lt8dEyuDQ 4szOPWkhsufjgCLdU+sA02W8= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:02 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (passt): Update to 2024_03_20.71dd405. Change-Id: I089b7e9364058e59139bdb7cb942fad693254c1f --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 9e3ba8918e..29577c5201 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -282,14 +282,14 @@ (define-public slirp4netns (define-public passt (package (name "passt") - (version "2023_12_30.f091893") + (version "2024_03_20.71dd405") (source (origin (method url-fetch) (uri (string-append "https://passt.top/passt/snapshot/passt-" version ".tar.gz")) (sha256 - (base32 "1nyd4h93qlxn1r01ffijpsd7r7ny62phki5j58in8gz021jj4f3d")))) + (base32 "1xyi1rqc3q2nbkd5mc4mp2m488ih5jy8v3xg0dgznh0149alx3y0")))) (build-system gnu-build-system) (arguments (list From patchwork Sun Mar 31 18:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62388 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3E43F27BBE9; Sun, 31 Mar 2024 19:36:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB6B827BBE2 for ; Sun, 31 Mar 2024 19:36:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02K-0001E4-To; Sun, 31 Mar 2024 14:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02G-0001C6-Sv for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02G-00081r-KB for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02J-00020p-8O for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 06/11] gnu: Add catatonit. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Wilke Schwiedop Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101437588 (code B ref 70112); Sun, 31 Mar 2024 18:36:07 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:43 +0000 Received: from localhost ([127.0.0.1]:48434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01u-0001yE-Qs for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:43 -0400 Received: from wolfsden.cz ([37.205.8.62]:40212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01d-0001w0-AT for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:26 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 0D07A29F246; Sun, 31 Mar 2024 18:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910122; bh=DnesEVQhnXTGC2o1yULvRQIFkaG35gu/VpXHsicc3M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C6DRGfN5TiaUFqqrwFeTavmu4RvumoP98OhFS1giF9o3zV2CYJf93PnklzyMitxu2 Np5FJ0vPrByhMCnS/6LijYPAgIoF01G22uJ5JE0RfDNFLuMUDgmWrN39lUC9UI/GVP 8HkyIkynMx25omtungRtnj6/VtopjkuxgYxmxXMehTlrSdG/yNaz5no7kRnk0JVKUp E3xgtnE3wtRpr6AZ+ULPGTT+2B2+fRN8ZKMHZB1rLidnjY1mZcWd8pJWVjtHvMiUe+ 6G13rez69K6vsgdEZhAtngJMEI+/pRnsyWT2cV2GTTxVcyxQR/bdEV7oQJcvrq+dKZ AJk5q7p0G3qup8sIrudXgUzA9peGpIRt+ggM/ifLHz9P4fPaQUvKVAJEkENNOcgcOB dVkAp0kRxW93WJlZH2R6hVNE8zunwBvwaSgjgXRhO/dVp/c6MSp5nDZz+vDsm8spYM xiBMForUAq7UDVpy6C0M3wm/mm/Rj6yIFVAfnGtAWgPrjkrOO08TIXtZVn9CgPNdbJ ozujI94CcRI2lk9igeIeVL7AuzY/breNPQ3UZWD7HoxnNZleezlpccOY7LhHknV5KP 4ZC27kIvY6PfH17zKjQUF1wWmiidtzM/H78xOLy6YWaw6YQdGx92NSMKUpxhZXOyBK W/FzDPVkbMIkIBdoqoQuIflU= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id B6F5E2A039A; Sun, 31 Mar 2024 18:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910121; bh=DnesEVQhnXTGC2o1yULvRQIFkaG35gu/VpXHsicc3M4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KRwChInc6uIQBS0cwXQdsHS74FPR8jkLUFeKwKYwTPW/8PPSv7x37CLf/TEyl9R8S 9/AAIrFmsIxGAmTNCqxf7yu8DTr/arV5JhW2iADgTUP+rEb+zg6cZ3S7/z/syciYC8 vxmN45tXX5TJLwfu2JR3S+40vqZnVNAzWtl3gkeQ1nxs0WYD3O+QftbnBm9vlpt5g5 +NbqwdYe4iOk9/mxK67hs5HT1JBFePcNDa6oLVMFo6dBynP5pipMvD+vt6i6dTO5tT o+EuNM7uNtljjCIVOPGeX6VeSHPDRKtUbnVghv0jfzgdmoQoiMMhnRF10+/UCIATJB bh2oYHJkqdjDxXMP6QYXhbMy78C/5jMsjg5S48hRlyJ7EPxqST3mKaBoF/8wxP1DdZ s/X8d1nbCZXYDaMFS9j7IULxG6IO5VQnYd3O7SBqKWozBUtxunPDKw2VYo4Xr/KAPJ k9eXrLrBNGfkuvqQVV9slJFk3HIS9X/t72TMNtZXCdPhlUJUfcD5kPxLYx9fOthwOg qccREFEpGgRG/f3U8Hr93Q7YPvENp71YbhQf36pxJNvohHAGlmZKwI7pk/AkSGSbin WeGEbv1Z/VFAnv2rsYaAsn12LMVSzYxoRrCUPFgZJHPAuAZN58rTMvvvsIBCp7g/Hl SWoVNzx3H6/uwohE0b5vkwQc= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:03 +0200 Message-ID: <09c7cafab463c35a8b3a47358dfab5b22c4bcf51.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Wilke Schwiedop * gnu/packages/containers.scm (catatonit): New variable. Change-Id: Ib6948bde8204426a8cb008982cb7cc9302f9e6d6 --- gnu/packages/containers.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 29577c5201..36948cf5e2 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -411,6 +411,26 @@ (define-public gvisor-tap-vsock The binary is called @command{gvproxy}.") (license license:asl2.0))) +(define-public catatonit + (package + (name "catatonit") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/openSUSE/catatonit/releases/download/v" + version "/catatonit.tar.xz")) + (sha256 + (base32 "141b5lypgqib546zmldi4kqzpqfd6vvqddqqkfaz3w11fjsc4hwq")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) + (synopsis "Container init") + (description + "A container init that is so simple it's effectively brain-dead.") + (home-page "https://github.com/openSUSE/catatonit") + (license license:gpl2+))) + (define-public podman (package (name "podman") From patchwork Sun Mar 31 18:35:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62390 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9E2F027BBE9; Sun, 31 Mar 2024 19:36:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E6C3A27BBE2 for ; Sun, 31 Mar 2024 19:36:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02L-0001E7-52; Sun, 31 Mar 2024 14:36:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02H-0001CQ-93 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02H-00081y-0f for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02J-00020w-LH for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 07/11] gnu: Add podman-compose. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101447595 (code B ref 70112); Sun, 31 Mar 2024 18:36:07 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:44 +0000 Received: from localhost ([127.0.0.1]:48436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr01v-0001yL-Gf for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:44 -0400 Received: from wolfsden.cz ([37.205.8.62]:51994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01e-0001wP-RA for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:27 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 87E612A0D04; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=jW4JzNg0Farh/zeG9pMpvK//Dj/gBU2vO0nvDJPQ8bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NSCaYuw2jUK8i0wjCO2l180SeI3hrmcY6htn7pbsW9bnByM14DnIzqEnCENWzQt8Q 1LCTMj/dIz38gi+uEmTEIJTKJYp/S0LBgNUkCCDAE2DxHyB+MVWSN/HbZgJSkAfA/W u845zSZT0dSYY0/O8ObB7YQLUsrZhnntVZxGcPhyC5m9ASFk6XI/6DQ3Urf88uaDZ1 /y1Yd4YCSOzDYqHk7U1ztyMAZGt+S5U2Bq3zcW61JrTn0wC5dTRlKo4OOzyVETtfd3 dzN/qtJ1ABFKzgvEfcgQWrHvKLaQ9ozLw0e+/U4Gh7moRWEGG+nPn0NiSbnqZN+YIn CpdIvQQFZ16X9LDH/RiHt2fYifZh4JpHAMYHxmUzt9H9ljuta7Llysra7d38j9cjFo 2MVb1/ZGSTmB6KZMXosvcepzU3D6S8hGGmbBP+6iFc9DDS+3IjYJjm8/ku3gXygVDK NQP4WT2WIVsm/CRyO2Xj3FmNb4/cfpHZWBraNtxbCgpNynK3Kxl5xvUtIcm3GAhbrG +WbByR047ovIXbhpUqLChpj7yxFHl2n/l2LuWvporoDxnrCT8yldlbZ3uiufeTf4Cf cOfCGCB2dCIJJEu58nJfE/ahs4+7ewWSzKglw8Y3Q3FV67Yutf7y4qqqxPlqQyD1Pw dBJ3sUcE/dB1Zjs1AmahsrbQ= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id A513329F6BD; Sun, 31 Mar 2024 18:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910122; bh=jW4JzNg0Farh/zeG9pMpvK//Dj/gBU2vO0nvDJPQ8bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ae0mezBtMT3FnGzMk3dNx02Er5N3esbBkHshUZBYjW7bFK/rAP2HeWNb7FLFh5Q0T 0Z/ByxgOE/D6zcqM6Nipfy8n3i4oSV2dUk3uE+cX3FhRmzhYFHfGKz2XPoDFby5C84 JywxxyInnjNBxv9+ixU3yQwH9rqBH/tk6QxdDF7BXk4Pk7QujKjwE+DhcNKVnocxTu 8fM2lHRdnriAq0/XyxXd8UhSUcfXKraQYhhc5JP4BJ9Gup3ONiE8t/MHMmY+eCjswI /Y+hbIYSpsgXNKJZK/PTL6wnhyuihFl/SGrcokvQAj7cM98rK4EGNlhRztJn+dL3+q YJc4P8seeJbqypdAb3DkAGuB1HeYWOUP9qBp+jrglgOxMiWYkbs1s5tHwcMCrpOHdJ UPwhFRogyMqfVzThkGzf6Zfn/a4J0gurviSdgZeVOi3GXSfmFfupqo1yq+/p3G29xr 3KhngqU5esDqWy2vdm987/cQivy2uFCc0KbISIE5sPVk8Wvdj6Xyd8XouqA89dgXbp byrLWeNMklIBHbe4mForh4FiRBqV70Jlzg71+McL5/gWOQnT3bait2BPvIzjmYCBqi 2V7S/N1L2LJjJ//tfFxaQo9InjD0QLrf+zWwg3sEiq7Wg4hVD9TslzS1YIb6IHUFvF e7/3cjqr7oIUgNxgioCoTvmk= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:04 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (podman-compose): New variable. Change-Id: Ieb5ee4b6e82464599a17ec950be8a7dbb2efa842 --- gnu/packages/containers.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 36948cf5e2..faea15b8c4 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -34,6 +34,7 @@ (define-module (gnu packages containers) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -49,6 +50,7 @@ (define-module (gnu packages containers) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages rust-apps) #:use-module (gnu packages selinux) #:use-module (gnu packages version-control) @@ -532,6 +534,34 @@ (define-public podman packaged.") (license license:asl2.0))) +(define-public podman-compose + (package + (name "podman-compose") + (version "1.0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/podman-compose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11dwpifkm20vyi6r3fgmiiqc01mpm4r8l0p5gfh0bawi2gklrhsf")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f)) + (inputs (list python-dotenv + python-pyyaml)) + (home-page "https://github.com/containers/podman-compose") + (synopsis "Implementation of @url{https://compose-spec.io/,,Compose Spec} +with @code{podman} backend") + (description "Provides an implementation of +@url{https://compose-spec.io/,,Compose Spec} for @code{podman} focused on +being rootless and not requiring any daemon to be running.") + (license license:gpl2))) + (define-public buildah (package (name "buildah") From patchwork Sun Mar 31 18:35:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62395 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2842D27BBEC; Sun, 31 Mar 2024 19:36:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28CFE27BBE2 for ; Sun, 31 Mar 2024 19:36:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02Q-0001GA-7M; Sun, 31 Mar 2024 14:36:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02H-0001Ca-Pz for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02H-00082B-E6 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02K-000213-2L for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 08/11] gnu: gvisor-tap-vsock: Remove references to go. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101547615 (code B ref 70112); Sun, 31 Mar 2024 18:36:08 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:54 +0000 Received: from localhost ([127.0.0.1]:48438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr026-0001yk-5e for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:54 -0400 Received: from wolfsden.cz ([37.205.8.62]:52008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01f-0001we-8J for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:27 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id EF1B929DBFD; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=PzXepjfMo84A2bxtyoRqJhbcfJmks8zwozmLG7KfvVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rih9SovF2MV3JUfkQ2//izWYAFBP7X8PEZY+SMwHTDf5P6163luP1Rw+iHag/NPjK 0yU3UsHxZO04o5CpiHu5b2fGqXZO0eaY58y54RUDHGnQ6XdTaPDBKRXBhunDfXVqk5 pID/sVNLux/jfOzzlbyuxKTi+jQrT9MMU5gOlTKG0Yt7tlRg10ynciYYjPJdh3wh9R Uz1VaWAHAWWV2pbmY5edoWtREOI0Nzlm3QVodHiC/TEQamairrMPIuQbAYdTV263xe 4oDeKD/HDcy+fhch9SnOJBIchwYXa3Z04VenXOfpWLY8idgBE3+kVuQXfhdoeeRblJ 73vcQFP2OXeL41mzF5N4JkWooA/sReanNPA2tGAeQHQChiNPdZC+rwVOvpZmiyt700 MDTxhSteUtI96KCrGSUprEaxxwlRa1WwSruTOO6S3fMLyLJr2MQP+K8pjjI43cmyOt gWRWzh6QpX8GQZs2x9VkbMUFgBlGF84uYVYP0QPPZ+moDl/Zkv2ra0BRw1C52gP1Nx 76QSP/uEbsu/IKmXDe9XrlM7x3IURaNY4k6zylUJk7VVrU4CiW5Hhv4q0L0wY0v3hb 7eDIHvk9RfedZhPSr+jDP7Yy10a+ohFes5ams5UDUsRJ97IQ2adfo6VaznhNIECRHZ pfT/gILCLvPnAI+cLsW3aNaQ= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 934812A0154; Sun, 31 Mar 2024 18:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910123; bh=PzXepjfMo84A2bxtyoRqJhbcfJmks8zwozmLG7KfvVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rih9SovF2MV3JUfkQ2//izWYAFBP7X8PEZY+SMwHTDf5P6163luP1Rw+iHag/NPjK 0yU3UsHxZO04o5CpiHu5b2fGqXZO0eaY58y54RUDHGnQ6XdTaPDBKRXBhunDfXVqk5 pID/sVNLux/jfOzzlbyuxKTi+jQrT9MMU5gOlTKG0Yt7tlRg10ynciYYjPJdh3wh9R Uz1VaWAHAWWV2pbmY5edoWtREOI0Nzlm3QVodHiC/TEQamairrMPIuQbAYdTV263xe 4oDeKD/HDcy+fhch9SnOJBIchwYXa3Z04VenXOfpWLY8idgBE3+kVuQXfhdoeeRblJ 73vcQFP2OXeL41mzF5N4JkWooA/sReanNPA2tGAeQHQChiNPdZC+rwVOvpZmiyt700 MDTxhSteUtI96KCrGSUprEaxxwlRa1WwSruTOO6S3fMLyLJr2MQP+K8pjjI43cmyOt gWRWzh6QpX8GQZs2x9VkbMUFgBlGF84uYVYP0QPPZ+moDl/Zkv2ra0BRw1C52gP1Nx 76QSP/uEbsu/IKmXDe9XrlM7x3IURaNY4k6zylUJk7VVrU4CiW5Hhv4q0L0wY0v3hb 7eDIHvk9RfedZhPSr+jDP7Yy10a+ohFes5ams5UDUsRJ97IQ2adfo6VaznhNIECRHZ pfT/gILCLvPnAI+cLsW3aNaQ= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:05 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This is handled automatically by go-build-system, but (obviously) not by the gnu-build-system, so add the phase manually. * gnu/packages/containers.scm (gvisor-tap-vsock)[arguments]<#:phases>: Add 'remove-go-references phase. Change-Id: I5cef0bc03dfa7f219bdfec4226d0e7772401a5a5 --- gnu/packages/containers.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index faea15b8c4..992ef82d3f 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -26,6 +26,7 @@ (define-module (gnu packages containers) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -387,6 +388,9 @@ (define-public gvisor-tap-vsock (list #:make-flags `(list ,(string-append "GIT_VERSION=v" version)) #:test-target "test" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -400,7 +404,9 @@ (define-public gvisor-tap-vsock (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) + (install-file "bin/gvproxy" (string-append #$output "/bin")))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor") From patchwork Sun Mar 31 18:35:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62396 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2E43927BBE2; Sun, 31 Mar 2024 19:36:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED,URIBL_SBL_A autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F04C227BBEA for ; Sun, 31 Mar 2024 19:36:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02Q-0001G9-6n; Sun, 31 Mar 2024 14:36:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02I-0001Ck-GP for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02I-00082Q-82 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02K-00021I-SD for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 09/11] gnu: podman: Revamp the package. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101567631 (code B ref 70112); Sun, 31 Mar 2024 18:36:08 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:56 +0000 Received: from localhost ([127.0.0.1]:48442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr027-0001yy-49 for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:56 -0400 Received: from wolfsden.cz ([37.205.8.62]:52018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01g-0001wu-Mj for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:30 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6962F29FEC1; Sun, 31 Mar 2024 18:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910125; bh=zNPrhNwHiroLcuKqsEG5jc88lsRJk2vhli2JsrI8AnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ohli54QSn3zQgiB/V1ZX1bk8KbIiWOJhGqa7oMPR7TwqSz8fKe73/CEUTrjIzt9BD NmF89UfLOZS5do/c9NeF+iH3zbAs2HjsO+fqQsVenRQwDWLKEJEjm6Lwl9sw2wIm7U rS45Pzstg8mV3RetGUlPOCOiShvrDU1Xi1Ry73QT/nwzIf4JdNheELRXX1r8j06eGC xPtFFVvocersvW/rcPJcQ89mPpfAHsbLhyH+fxigPIyZXvzI9OrMFkkGfc9oG7T99t oWKGVM3E0yRH7p29sJynt6ZGbROpfcjLXhdNPYerl2CK5Y6id7mk3RLvXicsV0j9GX fje5jd02ymUJDIIa1TQspYiacVxJFVOrMsVtVmwVXzG4/ynKkuUn2I90Juow/cr8EA VlKy5Fh2hwN39Z0/orwQXYO451WczYmVpdt483i3l4d1EbePvkwskGwURS0Lsq38wM qVlcaTeuybHyUbOU0+7tXCNvtTOd2AiSBQ7VnR9rzK1rNcGJeK3IFEmF5FXiJccZkx v2wUWflTJYAB+vuofjlP9G+LITl3lqdCw4lnz64Ye0RkZIvEtHESzFizYh9O1xO0Yp QANVk62Z83JvKOGsOn/CbpoX7bYsWzbYCH/wMYUSvFchze8kBGpNpAkWSZMd8UV1wi QfbjLVzgROy0K+wtjjOncgA0= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 8538829F7B8; Sun, 31 Mar 2024 18:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910124; bh=zNPrhNwHiroLcuKqsEG5jc88lsRJk2vhli2JsrI8AnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cOY33h4IbMXek2+cw4GDwbdfnlRo+sOLvU8GPiWUGJj9C+OJ91tH4EKA5chmD4lHG QL3IzY6oqk/0qLc51DqinQft8r7NI8Xkh40eATD5qlBHp9SjZdPlMsAEYNufHx3B/9 gHAHPzbh17zsto1180a8VWqVeGCyUmsKJcz6S4h3UEb6OVgfJMkZR6akvC2NGXgW6N 3b9JDstXm0RXm1BrLfM1tcpV/3BBEu2EkmsIwhb5BFTRLmpeZ4bYc6LJrr4R3Wzlsb 7tPUiRzuIeDJ3an8cYQ/Ta+Ts6mxqM7jkXFS45djQrEG1qO6IcGnn6rtrBt9jVOxtN jfbwnLdpub+YyFZVAM+zTd3/PnDTgq1gd2EkQk/qxgPmX30q8QwzCiKcJKMJZ3yFch VNZA9PRTjjK+DhR86JXx7dOYqH9CvKtdhcrPwlo7f0pSWcGCbBUGuW/xwvZ94Hr0Gp 3TEosvUdlfqckfUV1qdxPWuJ+I9Mu/9XOcQObb18wmlDhx23QBGzToFRGvWhp2JwEj 2mMHQ+qxdFX01aRoXzq4+soZrJOOvrmVb/DFwzzBe/F339cdZj7L47QGL2LPfAOS2A 8LrLzRK0PLeS1LGjmkjc+gZNyV8dQLlmHGRT3OUNJGzkuTISAgO6QqnqodXg53BqLH 1VrCx2tvHEKTJ0jj8LZWXMDg= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:06 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Substantial rework of the podman package. The source is no longer patched (at all) and all necessary modifications were moved into wrap-program and phases. Not everything is supported out of the box, but description mentions what packages to install to get additional functionality working. * gnu/packages/containers.scm (podman)[source]: Remove snippet and patches. [arguments]<#:make-flags>: Add HELPER_BINARIES_DIR. Add GOMD2MAN to actually use go-github-com-go-md2man package instead of the bundled version. <#:imported-modules>: Add (guix build go-build-system). <#:phases>{'set-env}: Set `CC' as an environment variable due to bug in make before 4.4. {'fix-hardcoded-paths}: Remove everything except patching `libexec' and `lib' locations. {'symlink-helpers}: New phase symlinking tools not discoverable via $PATH into one directory (`HELPER_BINARIES_DIR'). {'wrap-podman}: New phase wrapping `podman' to set correct $PATH. {'remove-go-references}: New phase stripping references to the golang toolchain from the binaries. [inputs]: Remove no longer needed cni-plugins, slirp4netns. Remove referenced in 'wrap-podman conmon, crun, iptables, passt. Move go-github-com-go-md2man into native-inputs. Add bash-minimal. [native-inputs]: Add custom grep with supported -P. Use newer go. Add mandoc. [description]: Explain how to get `podman compose' and `podman machine' working. * gnu/packages/patches/podman-program-lookup.patch: Delete file. Change-Id: Ifc28971a68751831d781517b041eec951a617087 --- gnu/local.mk | 1 - gnu/packages/containers.scm | 119 ++++++++++------- .../patches/podman-program-lookup.patch | 120 ------------------ 3 files changed, 74 insertions(+), 166 deletions(-) delete mode 100644 gnu/packages/patches/podman-program-lookup.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2b480bded..7056d4fdbc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1804,7 +1804,6 @@ dist_patch_DATA = \ %D%/packages/patches/plasp-fix-normalization.patch \ %D%/packages/patches/plasp-include-iostream.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ - %D%/packages/patches/podman-program-lookup.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 992ef82d3f..abd403af34 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -44,10 +44,13 @@ (define-module (gnu packages containers) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages glib) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages linux) + #:use-module (gnu packages man) + #:use-module (gnu packages pcre) #:use-module (gnu packages python) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) @@ -449,84 +452,104 @@ (define-public podman (uri (git-reference (url "https://github.com/containers/podman") (commit (string-append "v" version)))) - (modules '((guix build utils))) - ;; FIXME: Btrfs libraries not detected by these scripts. - (snippet '(substitute* "Makefile" - ((".*hack/btrfs.*") ""))) - (patches - (search-patches - "podman-program-lookup.patch")) (sha256 (base32 "0g15m10mgwssw5axkyn2ms5k858dbc6vf3cbxv7hvdncgwnfk5f0")) (file-name (git-file-name name version)))) - (build-system gnu-build-system) (arguments (list #:make-flags - #~(list #$(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" #$output)) + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "HELPER_BINARIES_DIR=" #$output "/_guix") + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'set-env - (lambda* (#:key inputs #:allow-other-keys) - ;; when running go, things fail because - ;; HOME=/homeless-shelter. - (setenv "HOME" "/tmp"))) + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; Make <4.4 causing CC not to be propagated into $(shell ...) + ;; calls. Can be removed once we update to >4.3. + (setenv "CC" #$(cc-for-target)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;; (invoke "strace" "-f" "bin/podman" "version") (invoke "make" "localsystem") (invoke "make" "remotesystem")))) (add-after 'unpack 'fix-hardcoded-paths (lambda _ - (substitute* "vendor/github.com/containers/common/pkg/config/config.go" - (("@SLIRP4NETNS_DIR@") - (string-append #$slirp4netns "/bin")) - (("@PASST_DIR@") - (string-append #$passt "/bin")) - (("@NETAVARK_DIR@") - (string-append #$netavark "/bin"))) - (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 "/libexec/podman")) (("/usr/local/lib/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"))))) + (string-append #$output "/bin"))))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-podman phase. + `((#$aardvark-dns . "aardvark-dns") + ;; Required for podman-machine, which is *not* supported out + ;; of the box. But it cannot be discovered via $PATH, so + ;; there is no other way for the user to install it. It + ;; costs ~10MB, so let's leave it here. + (#$gvisor-tap-vsock . "gvproxy") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-podman + (lambda _ + (wrap-program (string-append #$output "/bin/podman") + `("PATH" suffix + (,(string-append #$catatonit "/bin") + ,(string-append #$conmon "/bin") + ,(string-append #$crun "/bin") + ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$iptables "/sbin") + ,(string-append #$passt "/bin") + ,(string-append #$procps "/bin") ; ps + "/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (lambda* (#:key inputs #:allow-other-keys) + (let ((go (assoc-ref inputs "go"))) + (for-each + (lambda (file) + (when (executable-file? file) + ((@@ (guix build go-build-system) remove-store-reference) + file go))) + (append (find-files (string-append #$output "/bin")) + (find-files (string-append #$output "/libexec")) + (find-files (string-append #$output "/lib"))))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" (string-append "PREFIX=" #$output))))))) (inputs - (list btrfs-progs - cni-plugins - conmon - crun + (list bash-minimal + btrfs-progs gpgme - go-github-com-go-md2man - iptables libassuan libseccomp - libselinux - passt - slirp4netns)) + libselinux)) (native-inputs - (list bats + (list (package/inherit grep + (inputs (list pcre2))) ; Drop once grep on master supports -P + bats git go-1.21 - ; strace ; XXX debug + go-github-com-go-md2man + mandoc pkg-config python)) (home-page "https://podman.io") @@ -536,8 +559,14 @@ (define-public podman volumes mounted into those containers, and pods made from groups of containers. -The @code{machine} subcommand is not supported due to gvproxy not being -packaged.") +Not all commands are working out of the box due to requiring additional +binaries to be present in the $PATH. + +To get @code{podman compose} working, install either @code{podman-compose} or +@code{docker-compose} packages. + +To get @code{podman machine} working, install @code{qemu-minimal}, and +@code{openssh} packages.") (license license:asl2.0))) (define-public podman-compose diff --git a/gnu/packages/patches/podman-program-lookup.patch b/gnu/packages/patches/podman-program-lookup.patch deleted file mode 100644 index 27a9421285..0000000000 --- a/gnu/packages/patches/podman-program-lookup.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 914aed3e04f71453fbdc30f4287e13ca3ce63a36 Mon Sep 17 00:00:00 2001 -From: Tomas Volf <~@wolfsden.cz> -Date: Wed, 14 Feb 2024 20:02:03 +0100 -Subject: [PATCH] Modify search for binaries to fit Guix model - -Podman basically looked into the $PATH and into its libexec. That does not fit -Guix's model very well, to an additional option to specify additional -directories during compilation was added. - -* pkg/rootless/rootless_linux.go -(tryMappingTool): Also check /run/setuid-programs. -* vendor/github.com/containers/common/pkg/config/config.go -(extraGuixDir): New function. -(FindHelperBinary): Use it. -* vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -(guixLookupSetuidPath): New function. -(Start): Use it. ---- - pkg/rootless/rootless_linux.go | 3 +++ - .../containers/common/pkg/config/config.go | 23 +++++++++++++++++++ - .../storage/pkg/unshare/unshare_linux.go | 14 +++++++++-- - 3 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go -index d303c8b..0191d90 100644 ---- a/pkg/rootless/rootless_linux.go -+++ b/pkg/rootless/rootless_linux.go -@@ -102,6 +102,9 @@ func tryMappingTool(uid bool, pid int, hostID int, mappings []idtools.IDMap) err - idtype = "setgid" - } - path, err := exec.LookPath(tool) -+ if err != nil { -+ path, err = exec.LookPath("/run/setuid-programs/" + tool) -+ } - if err != nil { - return fmt.Errorf("command required for rootless mode with multiple IDs: %w", err) - } -diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go -index 75b917f..ed2f131 100644 ---- a/vendor/github.com/containers/common/pkg/config/config.go -+++ b/vendor/github.com/containers/common/pkg/config/config.go -@@ -1102,6 +1102,24 @@ func findBindir() string { - return bindirCached - } - -+func extraGuixDir(bin_name string) string { -+ if (bin_name == "slirp4netns") { -+ return "@SLIRP4NETNS_DIR@"; -+ } else if (bin_name == "pasta") { -+ return "@PASST_DIR@"; -+ } else if (strings.HasPrefix(bin_name, "qemu-")) { -+ return "@QEMU_DIR@"; -+ } else if (bin_name == "gvproxy") { -+ return "@GVPROXY_DIR@"; -+ } else if (bin_name == "netavark") { -+ return "@NETAVARK_DIR@"; -+ } else if (bin_name == "aardvark-dns") { -+ return "@AARDVARK_DNS_DIR@"; -+ } else { -+ return ""; -+ } -+} -+ - // FindHelperBinary will search the given binary name in the configured directories. - // If searchPATH is set to true it will also search in $PATH. - func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) { -@@ -1109,6 +1127,11 @@ func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) - bindirPath := "" - bindirSearched := false - -+ if dir := extraGuixDir(name); dir != "" { -+ /* If there is a Guix dir, skip the PATH search. */ -+ dirList = append([]string{dir}, dirList...) -+ } -+ - // If set, search this directory first. This is used in testing. - if dir, found := os.LookupEnv("CONTAINERS_HELPER_BINARY_DIR"); found { - dirList = append([]string{dir}, dirList...) -diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -index a8dc1ba..0b0d755 100644 ---- a/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -+++ b/vendor/github.com/containers/storage/pkg/unshare/unshare_linux.go -@@ -26,6 +26,16 @@ import ( - "github.com/syndtr/gocapability/capability" - ) - -+func guixLookupSetuidPath(prog string) (string, error) { -+ path, err := exec.LookPath(prog) -+ if err != nil { -+ path, err = exec.LookPath("/run/setuid-programs/" + prog) -+ } -+ return path, err -+} -+ -+ -+ - // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and - // handles setting ID maps and other related settings by triggering - // initialization code in the child. -@@ -237,7 +247,7 @@ func (c *Cmd) Start() error { - gidmapSet := false - // Set the GID map. - if c.UseNewgidmap { -- path, err := exec.LookPath("newgidmap") -+ path, err := guixLookupSetuidPath("newgidmap") - if err != nil { - return fmt.Errorf("finding newgidmap: %w", err) - } -@@ -297,7 +307,7 @@ func (c *Cmd) Start() error { - uidmapSet := false - // Set the UID map. - if c.UseNewuidmap { -- path, err := exec.LookPath("newuidmap") -+ path, err := guixLookupSetuidPath("newuidmap") - if err != nil { - return fmt.Errorf("finding newuidmap: %w", err) - } --- -2.41.0 - From patchwork Sun Mar 31 18:35:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62398 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 18B2927BBEA; Sun, 31 Mar 2024 19:36:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A3FB827BBE2 for ; Sun, 31 Mar 2024 19:36:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02N-0001El-PL; Sun, 31 Mar 2024 14:36:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02I-0001Ci-34 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02H-00082J-Qm for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02K-00021B-Ey for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 10/11] gnu: buildah: Update to 1.35.3. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101557622 (code B ref 70112); Sun, 31 Mar 2024 18:36:08 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:55 +0000 Received: from localhost ([127.0.0.1]:48440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr026-0001ym-Of for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:55 -0400 Received: from wolfsden.cz ([37.205.8.62]:52020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01h-0001ww-2y for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:29 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C43C129E5F6; Sun, 31 Mar 2024 18:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910125; bh=sNzwnE5RMjMrsiZBletzus3N4jvQkYlFnTysY7LcHTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WxgcPnCFVdonnQlntrk011EnaCp4P1UQutRJvKb5Y9GPQ1ivp30CESriXp2Xjn7wK c+CWFugZh3OC3fUFLPOnuJNL24jH6VPL72xmkWS+uZ2Kgp/LsSDFMcIXHNifN3KJZV g2ek+xHrHr1v3lsHQFP0QMZeKLlPm8oY3MuIQND88O6aQemT/WIObFxSj8vHrj2FTW GyWqQOO5M6gxsHzDIDfjrxqmEbOqfVA97aclZEraAb2JuD5vXFmk7TE35SZMQiegox qKw+lFMwIMuAObT+oY1B+Dcq2ST/yzEW3LlverXcnJtkv45vKRp5VQ+k2vBgmifJyC q8O2ni55MMPco4O6Jec2X8+iLD8QjcenppvRdv1NZ7p89tr9XRdkO74lXpCaP0eamg ZSDi8MYKZWQsyIIE3bEqRT/tBkQqwB6kCVfhm0P98mmr9gEpckpDtGD5gEpCsaoCOV aeI5ZJl2lqi73GW/4tiNiOJM7CnP31TjcSanLLoeSIx1RTIx7YoyiuTmLlO5WuYerR 0nZ8eGffchc1niaVecgdCxsQVTL6Vsp1feoupnkPc9T4w7PRlJ6AfGGdh4GkDBXvw5 eNbAAFluborB8DGaVhb7oOcyg5c/2JVrI28u6MrCEQcTW86nvDQtbeDzoUlC3Ts9Ld b70F9w5N1aqYgVs1Hs5Nw3ho= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 758162A1080; Sun, 31 Mar 2024 18:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910125; bh=sNzwnE5RMjMrsiZBletzus3N4jvQkYlFnTysY7LcHTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WxgcPnCFVdonnQlntrk011EnaCp4P1UQutRJvKb5Y9GPQ1ivp30CESriXp2Xjn7wK c+CWFugZh3OC3fUFLPOnuJNL24jH6VPL72xmkWS+uZ2Kgp/LsSDFMcIXHNifN3KJZV g2ek+xHrHr1v3lsHQFP0QMZeKLlPm8oY3MuIQND88O6aQemT/WIObFxSj8vHrj2FTW GyWqQOO5M6gxsHzDIDfjrxqmEbOqfVA97aclZEraAb2JuD5vXFmk7TE35SZMQiegox qKw+lFMwIMuAObT+oY1B+Dcq2ST/yzEW3LlverXcnJtkv45vKRp5VQ+k2vBgmifJyC q8O2ni55MMPco4O6Jec2X8+iLD8QjcenppvRdv1NZ7p89tr9XRdkO74lXpCaP0eamg ZSDi8MYKZWQsyIIE3bEqRT/tBkQqwB6kCVfhm0P98mmr9gEpckpDtGD5gEpCsaoCOV aeI5ZJl2lqi73GW/4tiNiOJM7CnP31TjcSanLLoeSIx1RTIx7YoyiuTmLlO5WuYerR 0nZ8eGffchc1niaVecgdCxsQVTL6Vsp1feoupnkPc9T4w7PRlJ6AfGGdh4GkDBXvw5 eNbAAFluborB8DGaVhb7oOcyg5c/2JVrI28u6MrCEQcTW86nvDQtbeDzoUlC3Ts9Ld b70F9w5N1aqYgVs1Hs5Nw3ho= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:07 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (buildah): Update to 1.35.3. Change-Id: I0a00d6a73079ddaa38a454856781adfc2d7f158f --- gnu/packages/containers.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index abd403af34..48b276e250 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -600,16 +600,17 @@ (define-public podman-compose (define-public buildah (package (name "buildah") - (version "1.29.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/containers/buildah") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mcqkz68fjccdla1bgxw57w268a586brm6x28fcm6x425ah0w07h")))) + (version "1.35.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containers/buildah") + (commit (string-append "v" version)))) + (sha256 + (base32 + "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) + (file-name (git-file-name name version)))) (build-system go-build-system) (arguments (list #:import-path "github.com/containers/buildah/cmd/buildah" From patchwork Sun Mar 31 18:35:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62391 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD3C727BBE9; Sun, 31 Mar 2024 19:36:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 08C3627BBEA for ; Sun, 31 Mar 2024 19:36:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr02g-0001Gv-6v; Sun, 31 Mar 2024 14:36:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rr02J-0001Cq-2J for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rr02I-00082b-Nv for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr02L-00021P-A5 for guix-patches@gnu.org; Sun, 31 Mar 2024 14:36:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70112] [PATCH 11/11] gnu: buildah: Switch to gnu-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Mar 2024 18:36:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70112@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70112-submit@debbugs.gnu.org id=B70112.17119101567637 (code B ref 70112); Sun, 31 Mar 2024 18:36:09 +0000 Received: (at 70112) by debbugs.gnu.org; 31 Mar 2024 18:35:56 +0000 Received: from localhost ([127.0.0.1]:48444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr028-0001z2-4f for submit@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:56 -0400 Received: from wolfsden.cz ([37.205.8.62]:52022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rr01i-0001x3-B2 for 70112@debbugs.gnu.org; Sun, 31 Mar 2024 14:35:30 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 113432A0B1E; Sun, 31 Mar 2024 18:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910127; bh=ba4BtJdnhGFJdUMaGqk4GWEzEYsOHuUfbGR+CnVBojw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EA89OLBUS+nr4h1VqcGcJYEQf/gaJvZHODTCf+3tc68Ei6PIMxtTWj9yE11xP5W5M +8EQvWw2bxTDeyC2qRZdWo228Y+gEq+m2rDN65QGmJh6RrbfH1Sst8brkPNJGpxC+P u9zNqvqwJfpmw6JMMPvtFG9z8YkROR2jqr3OmzoDMg8FRnNSFxfvtoSHYWj8Lnke54 XwU6XqyxQPn3GuZPY/h6atzZWdcVDnwU3mtD9ViALKNr87iiJUn7JyWuvvEgVBYBwK 1mGP0qAszuvSEDPaIweqbqF2f7dYQaLF35CrWmDXw9S0JCsclovJjADzXqYgWIIVlM 2qCTDHfJHScHXuMMuv5CXAel2/dqMDVh9JtwFpSoe5iieqHqOyE2lezaUp07r7Ge2j 4U/HpT7UWXVgfMQ8JAsozW8yUHktsfAKVP+YBGiUqpahIR1jM6nYUJ1SLv7X5twyyu dUutmfMp9fCWGu7kplrQsST/JSZESHEHhTU/s8hL6E5QDb6opcQ6uD407tmpSlvsN+ PT0MM5cMC95MZHbq04mv7SUAC6ki6modWeBzaNRwIYrR5+T/4YHq5594sWq2yyi6l7 43G51Sds5RbZlHT7AmFx5Gf5ABKBsk8cMrSTgkVFadN/WIKacWPX7uD7g1kk9hEpTj QlvWB/12/UjIuGjLt3SFwOqc= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 76EBF2A1082; Sun, 31 Mar 2024 18:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1711910126; bh=ba4BtJdnhGFJdUMaGqk4GWEzEYsOHuUfbGR+CnVBojw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EwLC5Ny1dmhDoSHOrDmApq39PKT5D3GJLH3+q75jiwOnDZqhTeTuvXCsU3Sm20Ogo w5E45/bMglZUFURmqKwDcBhscxCp6HVBJCfx9EIuMZndYYCTKZf7AUw9YdQSolD7r7 OSSawmSX52O+cubX8pZOCBPvej6pe3TbRpSLahiF3us4mYVdXpld2Gnhzn18kTJFtl 4gAo7cFd/+iS+ns6w4ZBJ6UI0EK3TBhPSMxRkTLcQTP/+yHM9WhXZi4BtU9XwAMkdS Fugnm1GoFa/o4JHhvR2AhhEmhf8BfpuajZ7N2xED29NtXDwZc1FpViF2aodavyYIvr 9mr6siTT+lC1Rez7nS/+R5nqH/zvMTw2YhrlxDHPONiK+JWhaaWgrMFhSgt1xObhuh YacUMtlp/3qb4qNaruPZboyjBt+bmoNrVa5duKwgfFEtV4ghi1JMBjz5PVb/mbS6bf hrNAo1M3G52dtH4AuD/Bkmo5krzyz9MqA/jwn+cj/2jCE+QPmkc6s202dIUB/nsOGD omn1QN5D4WBhKt+KvzdtLLeYBqHGes2GVWYW/ZKhYBJzr941ZUSgKpBAbKFIbSviHa +ly4QyeeefdzJylqWG5wbmMPkGCSS8WBPMx5OZPQmIxRmkj/mtE7Q/fZHKPeCpQQdq VNj3G9G4dufCelE+o4mena/c= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 31 Mar 2024 20:35:08 +0200 Message-ID: <31a1cbe8a908ae2892ea88606ee877be0915aeae.1711909824.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Buildah is fundamentally similar to podman and provides its own Makefile. This commit switches from go-build-system to gnu-build-system so that the build can be done using `make' instead of reinvention some parts (like documentation) in the guile. The package pretty much follows how podman package looks like. * gnu/packages/containers.scm (buildah)[source]: Reformat. [build-system]: Use gnu-build-system. [arguments]<#:import-path, #:unpack-path, #:go, #:install-source?>: Delete. <#:make-flags>: Set make flags. <#:test-target>: Set, even though the tests are disabled. <#:imported-modules>: Also import (guix build go-build-system) for the remove-go-references phase. <#:phases>{'prepare-install-docs, 'build-docs, 'install-docs}: Delete. {'configure}: Delete. {'set-env, 'check, 'symlink-helpers, 'wrap-buildah, 'remove-go-references} {'install-completions}: New phases. [inputs]: Remove no longer used cni-plugins, conmon, runc. Add bash-minimal. [native-inputs]: Remove gnu-make, add go-1.21 and bats. Change-Id: I0ddd5febb0116a71a857e2a98a9951dbe8bd40d9 --- gnu/packages/containers.scm | 99 +++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 48b276e250..2e68d08c94 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -611,50 +611,75 @@ (define-public buildah (base32 "07hr2cfp4kblnmva02ap97id5nzhbqigdfvx7c8nyrkfzw0340n0")) (file-name (git-file-name name version)))) - (build-system go-build-system) + (build-system gnu-build-system) (arguments - (list #:import-path "github.com/containers/buildah/cmd/buildah" - #:unpack-path "github.com/containers/buildah" - - ;; Some dependencies require go-1.18 to build. - #:go go-1.18 - - #:tests? #f - #:install-source? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'prepare-install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("../tests/tools/build/go-md2man") - (which "go-md2man"))) - (substitute* (string-append "src/" - unpack-path - "/docs/Makefile") - (("/usr/local") (string-append #$output))))) - (add-after 'build 'build-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc)))) - (add-after 'install 'install-docs - (lambda* (#:key unpack-path #:allow-other-keys) - (let ((doc (string-append "src/" unpack-path "/docs"))) - (invoke "make" "-C" doc "install"))))))) - (inputs (list btrfs-progs - cni-plugins - conmon + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + (string-append "GOMD2MAN=" + #$go-github-com-go-md2man "/bin/go-md2man")) + #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox + #:test-target "test-unit" + #:imported-modules + (source-module-closure `(,@%gnu-build-system-modules + (guix build go-build-system))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'set-env + (lambda _ + ;; When running go, things fail because HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU + ;; Make <4.4 causing CC not to be propagated into $(shell ...) + ;; calls. Can be removed once we update to >4.3. + (setenv "CC" #$(cc-for-target)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "test-unit") + (invoke "make" "test-conformance") + (invoke "make" "test-integration")))) + (add-after 'install 'symlink-helpers + (lambda _ + (mkdir-p (string-append #$output "/_guix")) + (for-each + (lambda (what) + (symlink (string-append (car what) "/bin/" (cdr what)) + (string-append #$output "/_guix/" (cdr what)))) + ;; Only tools that cannot be discovered via $PATH are + ;; symlinked. Rest is handled in the 'wrap-buildah phase. + `((#$aardvark-dns . "aardvark-dns") + (#$netavark . "netavark"))))) + (add-after 'install 'wrap-buildah + (lambda _ + (wrap-program (string-append #$output "/bin/buildah") + `("CONTAINERS_HELPER_BINARY_DIR" = + (,(string-append #$output "/_guix"))) + `("PATH" suffix + (,(string-append #$crun "/bin") + ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$passt "/bin") + "/run/setuid-programs"))))) + (add-after 'install 'remove-go-references + (@@ (guix build go-build-system) remove-go-references)) + (add-after 'install 'install-completions + (lambda _ + (invoke "make" "install.completions" + (string-append "PREFIX=" #$output))))))) + (inputs (list bash-minimal + btrfs-progs eudev glib gpgme libassuan libseccomp - lvm2 - runc)) + lvm2)) (native-inputs - (list go-github-com-go-md2man - gnu-make + (list bats + go-1.21 + go-github-com-go-md2man pkg-config)) (synopsis "Build @acronym{OCI, Open Container Initiative} images") (description