From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 1JdUOH3o92OiNgAAbAwnHQ (envelope-from ) for ; Thu, 23 Feb 2023 23:28:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0JCoN33o92MqDgEA9RJhRA (envelope-from ) for ; Thu, 23 Feb 2023 23:28:13 +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 8F2AB226B3 for ; Thu, 23 Feb 2023 23:28:13 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="OG/JPB5i"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677191293; a=rsa-sha256; cv=none; b=uhjsqMSaObT2YBlIl9kqRJbk0b4DQ07evByst22qXRCrHicK4WwgjCpPEu6hwxtijeAIh9 U/RyhXA5VzE+XbxvoPKqlRfZKgnubUGUhZRKUoTw8sCKvpiAUSP3M3jlWoLwXxiYb0J5Ol eMZKN30hdaa1v0Fdxy+rxYe8XvK+FYIA8Vla/QB4O0ZsE7rS5jazqZRgH3yrCMT6O0carh RWMn5p9NElJnYA5INldmBkZ0eTfn9SHadI6HpqEQN51E/HURLRWqmTqXJrBDmK0ygMBiUk QOyvXvOX3uUfTgsmLcH14l+jozn9l+To04cQRdy1TGHk6KXQFTQnj6uXLX+Rzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="OG/JPB5i"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677191293; 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=5DmKzi+WF9tN/yZoU+u0OP+6ukHMHsypAMA9Fd+VF+M=; b=R6wDUYc17BSs+soYJN9CS8g4AwazeHPzM8N7yRjFkrZHrYclwrMmhKVcMAdotEaycd8pYq BNiUZ0OzEHZA3bhpDoMXVW1WgA2vkXkp2jbxqtGLqAXJTCjv8qzwU1u59o+70LNBlvao9Y kpH3VfojWQutVmJP5vBWh4OC+Wbw4wae6EMOlJcM1hdcqjQaSQx0lVab5bpq5bnv+3fzNA kjatVo3F9jnbCaC0kmcj2cqz/GoWg9Gjn7IcGg3yd06Uzx7zYhxZYlg/cWkyLA1VQmNfDG yo/ou2Upbf5SA3B306/h+DfKu0+BE+NeWUN+/rd0E2zbP5504YZQqc1xK02Tvw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVK4M-0008De-84; Thu, 23 Feb 2023 17:28:06 -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 1pVK4I-0008DQ-LS for bug-guix@gnu.org; Thu, 23 Feb 2023 17:28:02 -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 1pVK4I-0001G9-DW for bug-guix@gnu.org; Thu, 23 Feb 2023 17:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVK4I-0005Wb-9n for bug-guix@gnu.org; Thu, 23 Feb 2023 17:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#61684: can't compose 'with-patch' with 'with-source' Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 23 Feb 2023 22:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61684 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 61684@debbugs.gnu.org Received: via spool by 61684-submit@debbugs.gnu.org id=B61684.167719127121216 (code B ref 61684); Thu, 23 Feb 2023 22:28:02 +0000 Received: (at 61684) by debbugs.gnu.org; 23 Feb 2023 22:27:51 +0000 Received: from localhost ([127.0.0.1]:35521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVK47-0005W7-GK for submit@debbugs.gnu.org; Thu, 23 Feb 2023 17:27:51 -0500 Received: from mail-qv1-f44.google.com ([209.85.219.44]:45727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVK44-0005Vq-UR for 61684@debbugs.gnu.org; Thu, 23 Feb 2023 17:27:50 -0500 Received: by mail-qv1-f44.google.com with SMTP id bo10so11537759qvb.12 for <61684@debbugs.gnu.org>; Thu, 23 Feb 2023 14:27:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=5DmKzi+WF9tN/yZoU+u0OP+6ukHMHsypAMA9Fd+VF+M=; b=OG/JPB5ilpQ7zKXaqmdAW5ph+cM+AwT8q+/RA7tXZ+b4w8wwsd2MadRbjzBGtsBb/5 4pHVfIbh0X3oKBSwfXEX1Gi6GV9/nKJ/rNMhAvdX5IulWyoTyRQ/glva31d62xDuZ+HJ 23dk1TJAwymEfFOX9Fqoeag7033T9QJG+9u30+Om45UqwdTF5LIce0mZy1nDnsYiRh7d g5HYXgJBSq4TC9CSFBW0Y6cVdNTqXAQf63MDxGzPlGdlfMS6ukIRPpdYslbKLjWz5Ehd +6Z3oVMjvcnZ0xE9hdu5WQWoOvvp99q2E4gDh1tATN68RyJ9dWaYPsW5sbM23hKPeBJB M/FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5DmKzi+WF9tN/yZoU+u0OP+6ukHMHsypAMA9Fd+VF+M=; b=0JMfU/Zypv9nZaU07V6cB6ilekKAj1BqAkHd6PZOFbyvCuwXY2ByW4lO2CPYpi4/Fa K8w64pxOTBFtezvqdjpQg6IOIBUWD1sVjhaKTUp/IoUsAXRr9i2T1xkrgi1sLwqXqRe/ Btnv8a7kU+EcLddsa66/oP4Q5iVWC1d+UZpl9WCrX5tDwE2ytzQbidItCEBYxOsLZwMj mlB0+YH0tb9YaT8e6Se0PuejtQgzgt13HrF0r08pgKxc1bd8IXZ53LwiMb0MPee/ECg5 nMwE3PgmUmwcUmp/hANV61tb8eoJrGe+U9U63hJ7WfaSls84plDxX6yMc0oGhqrA6yDJ PUJQ== X-Gm-Message-State: AO0yUKXTkraUcRI26dG3V/dJeiFBIjtjOeTHzi/5OtQ6tqYMJ827fKIy rkkpCJIC+ze7zAxj4wJC/Ta2ehGdLV2JoA== X-Google-Smtp-Source: AK7set/xLsvcgPgb/AkcIGZToQS8nMbwJts8gdLRleOla00CAAGx9wDpF4r8iUEsUY6oYlqG5EA3ZQ== X-Received: by 2002:a05:6214:20e9:b0:56e:99f2:1bb0 with SMTP id 9-20020a05621420e900b0056e99f21bb0mr23642841qvk.48.1677191263234; Thu, 23 Feb 2023 14:27:43 -0800 (PST) Received: from hurd (dsl-10-129-1.b2b2c.ca. [72.10.129.1]) by smtp.gmail.com with ESMTPSA id s128-20020a374586000000b007426b8eed51sm543024qka.118.2023.02.23.14.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 14:27:42 -0800 (PST) From: Maxim Cournoyer References: <87mt56gac6.fsf@gmail.com> <871qmg79u7.fsf@gnu.org> Date: Thu, 23 Feb 2023 17:27:41 -0500 In-Reply-To: <871qmg79u7.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Thu, 23 Feb 2023 15:08:48 +0100") Message-ID: <87356whvaa.fsf@gmail.com> 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: X-Migadu-Queue-Id: 8F2AB226B3 X-Spam-Score: -2.87 X-Migadu-Spam-Score: -2.87 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-TUID: 0HOewaINZCku Hi Ludovic, Ludovic Court=C3=A8s writes: > Hi Maxim, > > Maxim Cournoyer skribis: > >> Given 'with-source' discards any patch from the original source, I thoug= ht >> I could at least add them back via 'with-patch', but it appears this >> does not work: >> >> scheme@(gnu packages jami)> (options->transformation=20 >> `((with-source . "libjami@20230220.0=3D/hom= e/maxim/src/jami/jami-20230220.0.tar.gz") >> (with-patch . ,(string-append=20 >> "libjami=3D" (search-patc= h=20 >> "jami-disable= -integration-tests.patch"))))) >> $6 =3D # >> scheme@(gnu packages jami)> ($6 libjami) >> $7 =3D # >> scheme@(gnu packages jami)> (package-source $7) >> $8 =3D #< uri: "/home/maxim/src/jami/jami-20230220.0.ta= r.gz" recursive?: #t> >> scheme@(gnu packages jami)> >> >> The downloaded-file resulting package source has lost the patch, and no >> error got produced, leaving the user to discover this limitation by >> themselves. > > The order of options matters; in this case, you need to do it the other > way around: > > scheme@(guile-user)> (options->transformation '((with-patch . "jami=3D/tm= p/t.patch") > (with-source . "jami=3Dhttp://example.org/foo.tar.gz"))) > $18 =3D # > scheme@(guile-user)> ($18 jami) > $19 =3D # > scheme@(guile-user)> (package-source $19) > $20 =3D #< name: "jami-20230206.0-source" gexp: # guile: #f options: (#:local-bui= ld? #t)> > > The bit comes from the =E2=80=98with-patch=E2=80=99 trans= formation, to > apply the patch to the . > > If you do it the other way around, the effect of =E2=80=98with-patch=E2= =80=99 is > canceled by that of =E2=80=98with-source=E2=80=99, which does not preserv= e patches. So > strictly speaking, both options had an effect, but they were > contradictory. Hm. That seems sub-optimal; it seems to me that ideally, the transformations would be additive, so that users would not need to care about the ordering. Or perhaps, alternatively, we could enforce such ordering at the implementation level (sorting the transformations in the order that is required). > Note that ordering is =E2=80=9Cspecified=E2=80=9D, notably with the test = added in > 0f024554e63a49e20c2a7a67e928073c266bf5c5 (this is crucial for our HPC > users, who routinely combine a whole bunch of options; you have no idea > how far they go once you give them the tool :-)). I don=E2=80=99t think = the > manual explicitly states it though. It doesn't seem to be, indeed. But I wish we wouldn't need to (see my above suggestions/ideas). --=20 Thanks, Maxim