From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id wOOgLu1kY2eKUwEA62LTzQ:P1 (envelope-from ) for ; Thu, 19 Dec 2024 00:12:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id wOOgLu1kY2eKUwEA62LTzQ (envelope-from ) for ; Thu, 19 Dec 2024 01:12:29 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Lu26Egtq; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=IlM33uMw; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=Ttgxt4cw; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734567149; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=r6mjsNTBOqGIGK1s9dDI7wo3kDLHOIhYivoLWAy1DDQ=; b=WvKKbiQT6U+NU8fJ9tS9jzaIP/90/FSgYbvzasKDzW98lO+cSiF88QizBwUl3djAZSQfLe eK/qcilr3nCoeCmR/JgrOOXYHIgBwqGAgKglJai0dO0axTN5OdT2uF1KMz6kXAH3x9hOA8 gPnzTXkS8SUFYzRh9h9uhOj7splgAibs6w3SDqi+kvyqS4zusg0T8mWrUsGTLFA+p19Dl1 V7uxcewoyVC30swQlhrHxLOXErIsr+/syw0GlpSe8AREKuThp6E7T88/+KEezA+suGIkL/ tVRewOUbPbQWM1oHWkDlYrkuGUPF58YfSUph7gkCiMK5uem1qgEpfEVwEiNqLg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734567149; a=rsa-sha256; cv=none; b=s7Dhij6Ik0goIvQufzWDHuLif/n+vrq/typWkAvaM7nncp5g6kqCqUGvE+dP79KXZY6005 QEyupFDLXX4mo/HBPKWUbCKvIGJYg0IDSbgSPv8MloG7Px+pjcEG5A6lptwwIG+2tqm8gT cMkO22Pqf5WcTGqzKcVEbyattJwFfhQ869Y1ADP/PeoyLEAxyJj6EotWWgTav/8kOfOp6O Eahmnkph2q3kRYfhBSm3/ezf00bWYFRNv153+A7ZTBiWEj2rVFRp/HoCq4ypd03d9ptSkC nVm8Y9VVQ7H1z26MtrJhc4aDfF5flenoYmPfm5qvoaG9f38cUW/xhSBQ2wJ1fA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Lu26Egtq; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=IlM33uMw; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=Ttgxt4cw; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5CC251A748 for ; Thu, 19 Dec 2024 01:12:29 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tO497-0005tp-Vc; Wed, 18 Dec 2024 19:12:05 -0500 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 1tO495-0005tI-VM for guix-patches@gnu.org; Wed, 18 Dec 2024 19:12:04 -0500 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 1tO494-0003zm-Ti; Wed, 18 Dec 2024 19:12:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=r6mjsNTBOqGIGK1s9dDI7wo3kDLHOIhYivoLWAy1DDQ=; b=Lu26EgtqQN4/dg+YNM/Bb35nZx6iyiPvzz4PR/B/oaJAMNpRhaIBeYoo8N1rElJesmcx9/a3/IESu8v4ExUpwBdtwopGWiMkT34n5CTPuFyB+ZF5TRL0s3Alu+OxQr8Pkp5PrMElUN867sNGRkpxi+GSioMxamIfsX+CvjrWhQuxQFgjHwFbs4IzH10uPmT7+q1M9WSvWt1MNxVZNeCN51BT/BdooX+GB2RkxL1AOMzSg5ZAQZxZxRpMWFDew/x7Com829lNLA7Mp66TRC4k25fHM4QDMpJeAbrUzCWWUhHnz+OfBU8NuSt9YbzwsVgEm0T0FvYcQENNvCkZX57/rw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tO494-0001eO-B5; Wed, 18 Dec 2024 19:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74955] [PATCH] services: rootless-podman-service-type: Allow not installing podman. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 00:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74955@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.17345670816273 (code B ref -1); Thu, 19 Dec 2024 00:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 00:11:21 +0000 Received: from localhost ([127.0.0.1]:36508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tO48O-0001d6-Qy for submit@debbugs.gnu.org; Wed, 18 Dec 2024 19:11:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:36394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tO48N-0001cs-ND for submit@debbugs.gnu.org; Wed, 18 Dec 2024 19:11:20 -0500 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 <~@wolfsden.cz>) id 1tO48M-0005rN-JX for guix-patches@gnu.org; Wed, 18 Dec 2024 19:11:18 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tO48J-0003x7-GY for guix-patches@gnu.org; Wed, 18 Dec 2024 19:11:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id ADD0337D5FD; Thu, 19 Dec 2024 00:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1734567072; bh=no8vejHpELR2E38nYHvvB5cpp5/o7ZCxjzVitudgKA4=; h=From:To:Cc:Subject:Date; b=IlM33uMwL5lbPkuD95njK2bNKIas7KPveDbZnHrvlFixREpUZvKiYwG5M1kMJTnB3 Z5gLdwGfwLbGxjuTM0uh6VUIaTe8WaJmfWz9WSrrm3ILksIYzvCqAkrajd1fszHi7+ 6BjwvxLVoxu190qCCI8nGYiCWbXAVOIltsIoQQs3vJU1e+8x2mMNbE2igtRJ+nXgqn m2wqGij3wMK8DT8izJvauBdE/zpEDlNR9XcDpwwgjwuiFJbAYEqCXV1NZjc3EUNDIL 2pKhKWFxWE+u1/I7VpjAk/qPMrvlRr99rB3RJWMTYECh1yGcslSgFslT6a685jcQZF k/cz/5EikJVcUKhEtDmm1mImcejuywZPxXKov6k+rVo7R1GVXvX5B+uMGQtMhRAinz dSUOGOQ0Yem+a+7z57Pw0p+b7uNMsyw74/WlTTBoLBOjHiVKbOwQWpgnp0x/n0q19z 0qxflLUheBnxPCeG361iaKfjh2f5/p8KWK9MnC3ArRob++OTkRH5yWPN8j7efduhc8 qedNAk7qBoySq13js5X1MCmLTDmCBiJIKaObz8ZNUhZlN6ZGRNcgjcTy7ONMAsk2Yg 4vKGAwoCZ3XasWw4yaXDf6XlWA8o31HwPYQuugXH0zrmepeJm8SYhARG3U2AwV1DXy ILZAM6uHmHNmE+COa+15zHUk= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id D79BB37DDD0; Thu, 19 Dec 2024 00:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1734567066; bh=no8vejHpELR2E38nYHvvB5cpp5/o7ZCxjzVitudgKA4=; h=From:To:Cc:Subject:Date; b=Ttgxt4cwvTN4aW0AHbP81wbR7x3jxm1CC2t8fjjQSBLZh6H/npUvWgaczHjIYC6lX 0qQ/BVi6wFifPRh4T+DxchkarMDGmQ2EZsvlpZlNLJHR+ZplrYJ8QlnTI/MhhGgs54 +uc27Rqa9foV3x+A26ZeuLuYa15PBKd5iRMx0u8OphChxqGEdU9RU3K+Q1CIuWdvGj 1jaJokrvRINrV8Kx9R6vcTYkGRFBK7OvuS6wn63r/ON+Opzkds3UufIdMihc6hYxTb 06udsK9o5Ttd9p67G6x6ng8Y9PzlNLSgJLKrYwhEz2h7XTv0PBhpHZVJja74LOhTEw prEW2gYLPhneuIpYrigzAUG20eLV88NHjColPpg0jrIG1OkNwtAR1NJPdeg/jESPId mWakjxovFm1G+BpeZTZxjtpUuxLKpY8TaXfa6XnXFGO8AYqguz0v5nAMPi9CS5aEHa m1P06stwIbQjBP73hZEUc4K1W2pI3ISXuPTiRQIOeaw7F4qeGO01rCz6DzmSpoBzpM KhzOLeR49oeF0MD7z01J3pxR3Syy8nlzauO+nr17w5lw2kJIB/tMjsIhN6kE9IwrP/ YsioArrB/roOHZVSL9IEdbfHCbhJuHM561nZukcT4Tr8hwu5UIAZVsJF98IipaTtZm Vty5DzGatUM3dyBeemeNK+3U= From: Tomas Volf <~@wolfsden.cz> Date: Thu, 19 Dec 2024 01:11:03 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -0.57 X-Spam-Score: -0.57 X-Migadu-Queue-Id: 5CC251A748 X-TUID: zui/pKws1d/k Sometimes you would want to skip on actually installing the podman package in order to save disk space and bandwidth. Even without installing it globally, podman can still be fetched via guix shell when required. * gnu/services/containers.scm (package-or-#f?): New procedure. (rootless-podman-configuration): Change type to package-or-#f. (rootless-podman-service-profile): Produce empty list if not podman package. * doc/guix.texi (Miscellaneous Services): Document the change. Change-Id: If533d913ea190558ce7e206d98ada4d805270594 --- doc/guix.texi | 3 ++- gnu/services/containers.scm | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index f7b7569887..36bab360b4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41369,8 +41369,9 @@ Miscellaneous Services Available @code{rootless-podman-configuration} fields are: @table @asis -@item @code{podman} (default: @code{podman}) (type: package) +@item @code{podman} (default: @code{podman}) (type: package-of-#f) The Podman package that will be installed in the system profile. +@code{#f} can be passed to suppress the installation. @item @code{group-name} (default: @code{"cgroup"}) (type: string) The name of the group that will own /sys/fs/cgroup resources. Users that diff --git a/gnu/services/containers.scm b/gnu/services/containers.scm index 03f0649c0d..a3cdead0c3 100644 --- a/gnu/services/containers.scm +++ b/gnu/services/containers.scm @@ -63,10 +63,15 @@ (define list-of-pam-limits-entries? (define list-of-subid-ranges? (list-of subid-range?)) +(define (package-or-#f? val) + (or (not val) + (package? val))) + (define-configuration/no-serialization rootless-podman-configuration (podman - (package podman) - "The Podman package that will be installed in the system profile.") + (package-or-#f podman) + "The Podman package that will be installed in the system profile. +@code{#f} can be passed to suppress the installation.") (group-name (string "cgroup") "The name of the group that will own /sys/fs/cgroup resources. Users that @@ -106,8 +111,8 @@ (define-configuration/no-serialization rootless-podman-configuration (define rootless-podman-service-profile (lambda (config) - (list - (rootless-podman-configuration-podman config)))) + (or (and=> (rootless-podman-configuration-podman config) list) + (list)))) (define rootless-podman-service-etc (lambda (config) -- 2.46.0