From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cISDN1bDHWTMPwEASxT56A (envelope-from ) for ; Fri, 24 Mar 2023 16:35:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qNSINlbDHWSTcwEAG6o9tA (envelope-from ) for ; Fri, 24 Mar 2023 16:35:50 +0100 Received: from lists.gnu.org (unknown [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 A3F1F25EDC for ; Fri, 24 Mar 2023 16:35:50 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=c0x0o.me header.s=protonmail header.b="q/xIlfCA"; 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=1679672150; h=from:from:sender:sender:reply-to: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=KTIDiXBw1q2aLCvKy8Yz8QB7QEk56gOXfIWc53qCYCo=; b=Lvog0Kcd99c4WvbhadO/avJiYnMZr4O9bdLwLoaeNUgWSTUEP+FUby/1CkoAcRJLLBWSr5 lAzf8C6Tj3c7kGj3nZAoGi1yj1fQiIV/NZYw5iNZIqYpCpLHDhWL/Ao4XRv0CF/uxGo8aq uR9l+6Aaf0ErOi1D/o6J0jqkIhuB1iANno+VGQNyFcGcTU24OWzZOmYDqoj/yjP3+aO89P U0SOOOgCr7exuOtOFNzUhJtrvrEv8fSVsHgIej0kqCmGSmrFaO+g/HN9BnE8iz0nNVumhb tcEAbLfHrrtnrBYdYumXwp81U4AQaBbu1snYV5kItvuNYQ+T3aFPl0u+SQH7ow== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679672150; a=rsa-sha256; cv=none; b=f3/N3xX/PqLz4Om7idFv5xQWuDZJMMZgTcgAC82BsRO/PwhdTmrlI/q+ZV8NA9UlBlxYqd QgflDs0/5bmsGlXxf1GIUkegiRRKKJscb3InTrUFCIZA9689Ps/UpELvq6IesaRN1wsjEB nuHbrTD9T3uHB4P6LQFdC+LNsSbc3jHDnJ1nd+yG5vBppaxauRPhAocS2EoydmiIoTZs5I XmRSES/MZgoJLjr28hd9sdDyfJnVqYbvnyGjtJcsI+vGWipU8vAJyS1tuhuCf82gH3oeYo mPJQZvKvXvoAa9TmpNZmboUBdSu4p7MI3jfesFNsXesMZEplyrzubHegkZCgEA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=c0x0o.me header.s=protonmail header.b="q/xIlfCA"; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pff8Y-0003rY-KZ; Fri, 24 Mar 2023 06:59: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 1pff8U-0003oX-1d for guix-patches@gnu.org; Fri, 24 Mar 2023 06:59:08 -0400 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 1pff8S-00022K-SS for guix-patches@gnu.org; Fri, 24 Mar 2023 06:59:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfegN-0002OP-56 for guix-patches@gnu.org; Fri, 24 Mar 2023 06:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61680] [PATCH v3] gnu: podman: Add 'docker' alias script as 'docker' output Resent-From: Zongyuan Li Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Mar 2023 10:30:03 +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: 61680@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Liliana Marie Prikler Received: via spool by 61680-submit@debbugs.gnu.org id=B61680.16796537839133 (code B ref 61680); Fri, 24 Mar 2023 10:30:03 +0000 Received: (at 61680) by debbugs.gnu.org; 24 Mar 2023 10:29:43 +0000 Received: from localhost ([127.0.0.1]:39895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfeg3-0002ND-GP for submit@debbugs.gnu.org; Fri, 24 Mar 2023 06:29:43 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:30117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfefw-0002Mo-Be for 61680@debbugs.gnu.org; Fri, 24 Mar 2023 06:29:41 -0400 Date: Fri, 24 Mar 2023 10:29:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c0x0o.me; s=protonmail; t=1679653766; x=1679912966; bh=KTIDiXBw1q2aLCvKy8Yz8QB7QEk56gOXfIWc53qCYCo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=q/xIlfCAE/i2ImYyCTJfbBKbkYIqXh5btJR+bp/ZZ14LWD/3EgJpnEeCzgXsEwDk2 zgCD8Me6jSN5ayejmJucZN97mMA+2G0WOrZCwne7lwg9SO8RzQbPISkT0YRbc6cEqq 4DoKGBggrzC7nkqDEMT+jX5JyfQPmDcDi3MHVrj8jvr478LP4SszNiSx8fKoYOu7wp o4qfVvP2z4axiWGYALdcUSwrx5HAi59dHaioqc2TJaM0DWyGLdQ1uYTD5975CI6Sya nOQvz4obQlXQ4Al2PcpsyriQt3QfiQF+0GXLabBFya5mcHJ9G6+FmCd2CcrgMX4cA/ 5PGB4KRcyz/5g== Message-ID: In-Reply-To: <20230303080821.81649-1-zongyuan.li@c0x0o.me> References: <20230303080821.81649-1-zongyuan.li@c0x0o.me> Feedback-ID: 67462066:user:proton 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: List-Help: List-Subscribe: , Reply-to: Zongyuan Li X-Migadu-Queue-Id: A3F1F25EDC X-Spam-Score: -2.04 X-Migadu-Spam-Score: -2.04 X-Migadu-Scanner: scn0.migadu.com X-ACL-Warn: , Zongyuan Li via Guix-patches From: Zongyuan Li via Guix-patches via 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: /ESWHIgq7Iny Ping. Any further information? Thanks > On Mar 3, 2023, at 16:08, Zongyuan Li wrote: > > gnu: podman: Add 'docker' alias script as 'docker' output > > changes since v2: > > * Remove redundant trailing #t > * Adjust commit log > > * gnu/packages/containers.scm (podman): New 'docker' output for podman > --- > 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 b402bbde6a..b316588ea2 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"))) > (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"))))) > (add-after 'install 'install-completions > (lambda _ > (invoke "make" "install.completions" > -- > 2.37.1 (Apple Git-137.1) >