From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8L9MIaPsAGRBDgAAbAwnHQ (envelope-from ) for ; Thu, 02 Mar 2023 19:36:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id QCCcIaPsAGSl+wAAauVa8A (envelope-from ) for ; Thu, 02 Mar 2023 19:36:19 +0100 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 5DDC7185D3 for ; Thu, 2 Mar 2023 19:36:19 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Ysyseoqj; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677782179; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=AJx2YCCSvQy6QTUL6xcZwjiIn7W6XaD47nZKFY3PY/U=; b=Jd18rxZREPJ2yJku1fuF+YpKRulryHBpxLbsD9jVYFIC3d8NSSrOvY2Leyh2HMbVoxrNTx Vg4eFPgSIPa8fjLOFB8oe909N9PS1Z4RTqSmU0uDJ7tzX8vM2Ng/1J8g7b0CgKS2dV3E27 j7Um6k1H9SAD2YUaHHdeZcJKNLKZ463i+RyW3Xdoum6HkdzlhqN86woS1Z01MGbYd+dr6D 6TtCqHSFdZ+GCZ9TCCOJnAS2rTPUb1xV4kPtt6K/OeUtU0C/eKIeep83KgTXcV6Q80fYYy MtCS5uuL7yGhcD9IZDDJOSVwVZPT118fJUL6hwojXNu3weszDZkWdjnUXd9FYQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Ysyseoqj; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677782179; a=rsa-sha256; cv=none; b=S9kCEr8H2Wm+qSA+yHUvGBy2ZVKc5NUsbCQSXG2c4Yrp9JmCJjfQewR3+RpJnBQcORQCpC EBxFMsN7Z193WrGoHXrYgAt+SVkBz7jszjmiWg1kyW+cryHN5UImNxlwEzA0bNVCieBtsy HxZBfkbVZS+9CKwjQZteBM6iovKcXCmT9w6q7KCEcET74bY3fcrcSf6/SohNtlTryofXnP t7lkmgsP3WIkEwYm4z72sVgAiWZXzUFBCZixCS6LTpzKP5raOlqtZ26l9IjjCAKJNBneIw Z6WKHrBT2usyyAXXbByJOpvmMrF6MDizSodgCmpPfD7k1eOL1FdCObRss+P+3w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXnme-000656-N4; Thu, 02 Mar 2023 13:36:04 -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 1pXnmd-00064s-0O for guix-patches@gnu.org; Thu, 02 Mar 2023 13:36:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXnmc-0002VV-OA for guix-patches@gnu.org; Thu, 02 Mar 2023 13:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXnmc-0003VM-Fn for guix-patches@gnu.org; Thu, 02 Mar 2023 13:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61680] [PATCH] gnu: podman: Add 'docker' alias script as 'docker' output Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 18:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61680 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zongyuan Li Cc: 61680@debbugs.gnu.org, liliana.prikler@gmail.com Received: via spool by 61680-submit@debbugs.gnu.org id=B61680.167778213713439 (code B ref 61680); Thu, 02 Mar 2023 18:36:02 +0000 Received: (at 61680) by debbugs.gnu.org; 2 Mar 2023 18:35:37 +0000 Received: from localhost ([127.0.0.1]:58374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXnmC-0003Uh-QZ for submit@debbugs.gnu.org; Thu, 02 Mar 2023 13:35:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXnmB-0003UT-4c for 61680@debbugs.gnu.org; Thu, 02 Mar 2023 13:35:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXnm5-0001Jr-Mk; Thu, 02 Mar 2023 13:35:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=AJx2YCCSvQy6QTUL6xcZwjiIn7W6XaD47nZKFY3PY/U=; b=YsyseoqjjskmWEMrrZKs K0KcV8EUYJiNpFWNE2FcZn5xK9sE+zGWAjiL+2MdoH4BuQZpYC9tkoPbqMa8HewX+7vxFJewuqqex AQ/7o/TixvEx+RJk89mvzAyvTUJz4lzSLFx6y4Ehmc4mGBeaset6remDa/uunH4NZu6L5NbA4Y/ib 6CHYzlnyWyjvgMHEegvyORjt67taACE4gydikjcyHd3WXfIVEuxEYMc+OpbCz+q3s4/FP3GoyTFE9 gMG/9C2TqAv4QKupQEW58sNjjna/LwGf1jJAyDvtwZ5EgBH9TW+e9dN3XL+SgqAD58cjfrU2pR1bb 7nox1X/NOE8MyA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXnlj-0006MJ-K6; Thu, 02 Mar 2023 13:35:19 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20230221143401.42099-1-zongyuan.li@c0x0o.me> <20230223065633.51256-1-zongyuan.li@c0x0o.me> Date: Thu, 02 Mar 2023 19:35:05 +0100 In-Reply-To: <20230223065633.51256-1-zongyuan.li@c0x0o.me> (Zongyuan Li's message of "Thu, 23 Feb 2023 06:56:45 +0000") Message-ID: <87356n3sti.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: X-Migadu-Spam-Score: -5.50 X-Spam-Score: -5.50 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: 5DDC7185D3 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-Country: US X-Migadu-Flow: FLOW_IN X-TUID: joHLP3RJ7VvZ Hi, Zongyuan Li skribis: > Introduces a output named 'docker' in podman package. This > output provides a 'docker' alias for podman. Since their > cmd interface are identical, this simple script just act > the same as 'alias docker=3Dpodman', with some additional > checks and notification. > > Changes since v1: > > * Add more details in commit messages > * Revert style format > * Add output-synopsis for 'docker' output > > * gnu/packages/containers.scm: New 'docker' output for podman Regarding the commit log, please check =E2=80=98git log=E2=80=99 and the = =E2=80=9CSubmitting Patches=E2=80=9D of the manual for convention. We can tweak that for you i= f you want, but basically it=E2=80=99s about describe what has changed, not why. > gnu/packages/containers.scm | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm > index 272b67c38d..50dfa88421 100644 > --- a/gnu/packages/containers.scm > +++ b/gnu/packages/containers.scm > @@ -327,6 +327,9 @@ (define-public podman > (file-name (git-file-name name version)))) > > (build-system gnu-build-system) > + (outputs '("out" "docker")) > + (properties > + `((output-synopsis "docker" "docker alias for podman"))) Are there downsides to having the =E2=80=98docker=E2=80=99 command directly= in =E2=80=9Cout=E2=80=9D? I would prefer that because it=E2=80=99d be more easily discovered. > (arguments > (list > #:make-flags > @@ -349,7 +352,7 @@ (define-public podman > (invoke "make" "localsystem") > (invoke "make" "remotesystem")))) > (add-after 'unpack 'fix-hardcoded-paths > - (lambda _ > + (lambda* (#:key outputs #:allow-other-keys) > (substitute* (find-files "libpod" "\\.go") > (("exec.LookPath[(][\"]slirp4netns[\"][)]") > (string-append "exec.LookPath(\"" > @@ -365,7 +368,14 @@ (define-public podman > (("/usr/local/libexec/cni") > (string-append #$(this-package-input "cni-plugins") > "/bin")) > - (("/usr/bin/crun") (which "crun"))))) > + (("/usr/bin/crun") (which "crun"))) > + (substitute* "docker" > + (("/usr/bin/podman") (string-append (assoc-ref outputs "= out") > + "/bin/podman"))))) > + (add-after 'install 'install-docker > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((docker (assoc-ref outputs "docker"))) > + (install-file "docker" (string-append docker "/bin")) #t= ))) No need for a trailing #t. Thanks, Ludo=E2=80=99.