From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GOUPOZ82nV+QNwAA0tVLHw (envelope-from ) for ; Sat, 31 Oct 2020 10:04:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2PYKNZ82nV/gNAAA1q6Kng (envelope-from ) for ; Sat, 31 Oct 2020 10:04:15 +0000 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 73CB59403A0 for ; Sat, 31 Oct 2020 10:04:15 +0000 (UTC) Received: from localhost ([::1]:55890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYnk6-0004Be-Ef for larch@yhetil.org; Sat, 31 Oct 2020 06:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYnju-0004BU-Es for guix-patches@gnu.org; Sat, 31 Oct 2020 06:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kYnju-0005IF-4A for guix-patches@gnu.org; Sat, 31 Oct 2020 06:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kYnju-0006AN-0G for guix-patches@gnu.org; Sat, 31 Oct 2020 06:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44321] [PATCH 3/6] guix build: 'options->transformation' no longer takes a 'store' parameter. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Oct 2020 10:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44321 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Cc: 44321@debbugs.gnu.org Received: via spool by 44321-submit@debbugs.gnu.org id=B44321.160413862023673 (code B ref 44321); Sat, 31 Oct 2020 10:04:01 +0000 Received: (at 44321) by debbugs.gnu.org; 31 Oct 2020 10:03:40 +0000 Received: from localhost ([127.0.0.1]:60560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYnjX-00069l-MG for submit@debbugs.gnu.org; Sat, 31 Oct 2020 06:03:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYnjV-00069Y-B0 for 44321@debbugs.gnu.org; Sat, 31 Oct 2020 06:03:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36098) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYnjQ-00057k-3j; Sat, 31 Oct 2020 06:03:32 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56718 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kYnjP-0004wI-OC; Sat, 31 Oct 2020 06:03:31 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20201029231000.14568-1-ludo@gnu.org> <20201029231000.14568-3-ludo@gnu.org> <87wnz74aem.fsf@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 Brumaire an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 31 Oct 2020 11:03:30 +0100 In-Reply-To: <87wnz74aem.fsf@gmail.com> ("Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Fri, 30 Oct 2020 23:27:29 +0100") Message-ID: <87r1peww3x.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 4R+dQ53Xf9to Hi Miguel, Miguel =C3=81ngel Arruga Vivas skribis: > Ludovic Court=C3=A8s writes: >> ("options->transformation, with-source") >> ("options->transformation, with-source, replacement") >> ("options->transformation, with-source, with version") >> ("options->transformation, with-source, PKG=3DURI"): Use 'lower-object' = to >> compute the store file name of the source. > [...] >> @@ -64,12 +66,9 @@ >> (let* ((p (dummy-package "guix.scm" (replacement coreutils))) >> (s (search-path %load-path "guix.scm")) >> (t (options->transformation `((with-source . ,s))))) >> - (with-store store >> - (let ((new (t store p))) >> - (and (not (eq? new p)) >> - (string=3D? (package-source new) >> - (add-to-store store "guix.scm" #t "sha256" s)) >> - (not (package-replacement new))))))) >> + (let ((new (t p))) >> + (and (not (eq? new p)) >> + (not (package-replacement new)))))) >>=20=20 >> (test-assert "options->transformation, with-source, with version" >> ;; Our pseudo-package is called 'guix.scm' so the 'guix.scm-2.0' sour= ce > > It's the only one that doesn't follow the same pattern as others, where > the change look quite similar: instead of (t store p) -> (t p) (source > (run-...)), also specified in the message. > > If removing that comparison is intended, I think the commit message > should be changed. Otherwise it LGTM. Good catch! I guess I was hesitant here. I=E2=80=99ll re-introduce the te= st using =E2=80=98run-with-store=E2=80=99 and all. Thanks, Ludo=E2=80=99.