From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kE3ANNWJi2LklwAAbAwnHQ (envelope-from ) for ; Mon, 23 May 2022 15:19:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cDGUM9WJi2LmCQEAG6o9tA (envelope-from ) for ; Mon, 23 May 2022 15:19:17 +0200 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 4DE8B31461 for ; Mon, 23 May 2022 15:19:17 +0200 (CEST) Received: from localhost ([::1]:58498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nt7xr-0000Jj-Kg for larch@yhetil.org; Mon, 23 May 2022 09:19:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt7vi-0007Ac-T1 for guix-patches@gnu.org; Mon, 23 May 2022 09:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nt7vi-0005aq-Jl for guix-patches@gnu.org; Mon, 23 May 2022 09:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nt7vi-00070n-CD for guix-patches@gnu.org; Mon, 23 May 2022 09:17:02 -0400 Subject: bug#55316: [PATCH] scripts: package: Transform before creating manifest entries. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 23 May 2022 13:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 55316 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 55316-done@debbugs.gnu.org Mail-Followup-To: 55316@debbugs.gnu.org, ludo@gnu.org, dev@jpoiret.xyz Received: via spool by 55316-done@debbugs.gnu.org id=D55316.165331176626854 (code D ref 55316); Mon, 23 May 2022 13:17:02 +0000 Received: (at 55316-done) by debbugs.gnu.org; 23 May 2022 13:16:06 +0000 Received: from localhost ([127.0.0.1]:47624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nt7un-0006z4-RO for submit@debbugs.gnu.org; Mon, 23 May 2022 09:16:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nt7ui-0006yE-K0 for 55316-done@debbugs.gnu.org; Mon, 23 May 2022 09:16:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt7ud-0005IJ-2o; Mon, 23 May 2022 09:15:55 -0400 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=v/19uzld6gEGhcQp4F+7lzB9XHB2ng758f905o15WMI=; b=ZiFMqMywQy+MOn8uBgMP yXtAHfNsgnsK8k7jUnr6E+nNaYEYGtpHPTwFMu5Hv8StN/tntyTUd7nIK577TnQ3+AhXySGdqMuUJ SX+iLkppVGLen64gh1ga8YPFJ3lyXz6sy7IX/P6z1b0h0/QWmg5ccKApXw3VIk+s88CJ+CDiCf64m SQUy+OXd1TZxV1Qffyaqp2bP9pT1KrtBiKPMO6mHoSePt36xDX+1l+yVbF+CetGPzdjP2mh7JLUPG 2lG4hCQEfkLxYZrOIthrknD2te1DJ+gHlI4r09MVkmIrtgwKsfL8pQ33olTVoVYxgDInSu21PHcCn csNTkqO+ew9ouA==; Received: from [193.50.110.143] (port=52548 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt7uR-0001m8-FM; Mon, 23 May 2022 09:15:49 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <874k1zrq2p.fsf@gnu.org> <20220509145410.11678-1-dev@jpoiret.xyz> Date: Mon, 23 May 2022 15:15:41 +0200 In-Reply-To: <20220509145410.11678-1-dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 9 May 2022 16:54:10 +0200") Message-ID: <87tu9g75ky.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653311957; 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:resent-to: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=v/19uzld6gEGhcQp4F+7lzB9XHB2ng758f905o15WMI=; b=j3+1h+tLwnIObUJnpVNyHNu+67CNpRF8pD5Dh6B9jfD17sw68NBuOticTGA2Mn2Pt6slIP ttqHBX9xL2JYYcHFyF9n9Roowf1yE4cZL4gpT6PQNx8hrFIbPVGlLgdAHPTyFe2tM6IYCn POMzrWz9hHoAWKgaF3kSlN1RwMfXW4o0ab/njudFbovLX9k/frcOaUapmEM7+rFgKFLkOK snx1Ru6wUC8dlfhzRi5RJEjPknYnet5+AD32CFN1zGOemuUFFw0uSqsBbgmpWOAp+iDxqF T0pHdApCi+ZGWXSTmWsVEy2H4G1kxc+r723c2tFUdgXJjSPhoHdyVPiF/juIww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653311957; a=rsa-sha256; cv=none; b=H5m6a0RhaFUYVcuCbyGZ7Y+3V1w0HhvZ82axn6aRmiPnWidqyTALDeT4N24cFpope3o1mY sjkcQFBuFEzybeY8mznntbwRLJiQmUqZhTvcE1c3GCqCkMyVH6dgI8o/xZyFMj1+e3LNsO ePBXFJ72G4WiWZokm+xA4galZB3G+6THleUnZ7IbWnXc8jpKQ/z5TGufwprEQCVj946c2G F+5KnFm125pnwk3mGgzz9un34W6wXzTFcRN9yUonYQSMfhjHoAV/D2zJBaidjI8EgL6Vel Bo60vLsOuN76nR6wHbHD4S553iOlou9eH3IF3rvyj9pIBFVUTr4AXYAUomVEjA== 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=ZiFMqMyw; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ZiFMqMyw; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 4DE8B31461 X-Spam-Score: -3.45 X-Migadu-Scanner: scn0.migadu.com X-TUID: XOan9168DSfM --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Josselin, Josselin Poiret skribis: > * guix/scripts/package.scm (options->installable): Add TRANSFORM > argument, to be able to directly transform the new packages before > creating their manifest entries. > (process-actions): Remove transform-entry, and step3, transforming > directly in step2. > * tests/guix-package.sh: Add test. Finally applied with the cosmetic change below, thank you! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/tests/guix-package.sh b/tests/guix-package.sh index c2f5e39de0..dedba2fd74 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -212,8 +212,8 @@ test ! -f "$profile/bin/sed" rm "$profile" "$profile"-[0-9]-link # Make sure transformations apply to propagated inputs and don't lead to -# conflicts when installing them alongside, see bug -# +# conflicts when installing them alongside, see +# . mkdir "$module_dir" cat > "$module_dir/test.scm" <