From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ALKxI5tz92MSQAEAbAwnHQ (envelope-from ) for ; Thu, 23 Feb 2023 15:09:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OJezIptz92OeGwEAG6o9tA (envelope-from ) for ; Thu, 23 Feb 2023 15:09:31 +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 5A7482C724 for ; Thu, 23 Feb 2023 15:09:31 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Ju4/03zt"; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677161371; a=rsa-sha256; cv=none; b=n9PO0ya9U5B1MasA+pdsBP8tyCLOrsHpSdJpcDZWLXHT0rj9xwy81RhJpThUoS9kFTWQgi uk0sq+bA/5zhQ9Di+6CZ/O0hs1/NuqYaoENNdUqA+QtSrsWKjEfG+TY3HNGY9lWe3Pe8u7 okgGslVH+gZyDPZzdBQEC0yFRbpLYZ9mlcu2p9QQtiNUEnYcfJ0Fvr9Pi7RS49zvmBLgtf 84C0XfeLa/XS3oJrYaXUvHUcGsMPlD7xe6qOHGhjilKec0Aw5h8C59rt9mBlt9qscbLtT1 Rf6Zd1pliRx9vgiJ+NYNd/4oFzdSDMCqAkR8uvKho4veSeYIwoPISu4xGFwysA== 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="Ju4/03zt"; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677161371; 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=5p0ajXHisnitoNjesBYu6nmsUB/ZBXBWTQ8E9e8+97o=; b=CTYMRbqSx8mob6ZURaQiSH4p2ks/9+glYbaVYyxgvv9S40841eEXAJpYr9yJP7bPlKIp3g hVdnCKc7pQ4wvnKeyN/56QZPv79wvYIzscxwM2iDhq922fJ6kq6bw3NRAMZoOrn9BFdsIA n6zElZrKP72AQ4fzva25ZYmTRVIOG9IiwmANHPNKd3a31XVnWmnIcCJHwEwgrGCtEd0MXX sCZXwVfWAAuke8eqcPy6mFKwrPhUVAhY8ZyEc4V15LN4MYPk/ewtC6SuHq/NTWH7VyedC1 DTViHKTAg1gFAWXEL0Niv/0BDslklPdrxeayl9zMuHcenrUxePIeRe1UOfoLpw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVCHX-0001kd-M8; Thu, 23 Feb 2023 09:09:11 -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 1pVCHO-0001gJ-KY for bug-guix@gnu.org; Thu, 23 Feb 2023 09:09: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 1pVCHO-00083U-1B for bug-guix@gnu.org; Thu, 23 Feb 2023 09:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVCHN-00067B-SH for bug-guix@gnu.org; Thu, 23 Feb 2023 09:09:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#61684: can't compose 'with-patch' with 'with-source' Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 23 Feb 2023 14:09:01 +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: Maxim Cournoyer Cc: 61684@debbugs.gnu.org Received: via spool by 61684-submit@debbugs.gnu.org id=B61684.167716133823494 (code B ref 61684); Thu, 23 Feb 2023 14:09:01 +0000 Received: (at 61684) by debbugs.gnu.org; 23 Feb 2023 14:08:58 +0000 Received: from localhost ([127.0.0.1]:33446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVCHJ-00066s-Fy for submit@debbugs.gnu.org; Thu, 23 Feb 2023 09:08:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVCHI-00066e-8A for 61684@debbugs.gnu.org; Thu, 23 Feb 2023 09:08:56 -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 1pVCHD-0007Vu-1p; Thu, 23 Feb 2023 09:08:51 -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=5p0ajXHisnitoNjesBYu6nmsUB/ZBXBWTQ8E9e8+97o=; b=Ju4/03ztd74l92KyuL3H JYeEPLRMTE9tuWIIWdJitDio2nFOEniMchuvu7FnIQSJXZo5hNltK4/StTz49yOilXMTP5HiojVYe m2/ypj6qW/jhB9YYPe+dtwy0pHfWYXSORXX2ImjbkHcjwndOzs8cfwgU1E98JS1Jr3olqQjuHQkp+ YzVtZ5ii6hypwRMrVMCXBKbAReA4XwbTmy3vr9TW8xekrRC/J11W5i9y+ZhCWi4jvTALy0ptRSCNy qPYJ59pPQDoBZNRR8iBxbiKwsTE1lSCxWOFHrzE+bmjuTOZRlxsPDncVebKqN2JtXK4EDVmV18py1 +vMCyWhyfGh3uw==; 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 1pVCHC-0007Jg-IX; Thu, 23 Feb 2023 09:08:50 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87mt56gac6.fsf@gmail.com> Date: Thu, 23 Feb 2023 15:08:48 +0100 In-Reply-To: <87mt56gac6.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 21 Feb 2023 13:08:41 -0500") Message-ID: <871qmg79u7.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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: X-Migadu-Queue-Id: 5A7482C724 X-Spam-Score: -3.97 X-Migadu-Spam-Score: -3.97 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: DA0+z2z3Y6T/ Hi Maxim, Maxim Cournoyer skribis: > Given 'with-source' discards any patch from the original source, I thought > 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/home= /maxim/src/jami/jami-20230220.0.tar.gz") > (with-patch . ,(string-append=20 > "libjami=3D" (search-patch= =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.tar= .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: --8<---------------cut here---------------start------------->8--- scheme@(guile-user)> (options->transformation '((with-patch . "jami=3D/tmp/= 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-build= ? #t)> --8<---------------cut here---------------end--------------->8--- The bit comes from the =E2=80=98with-patch=E2=80=99 transfo= rmation, 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 preserve = patches. So strictly speaking, both options had an effect, but they were contradictory. Note that ordering is =E2=80=9Cspecified=E2=80=9D, notably with the test ad= ded 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. HTH, Ludo=E2=80=99.