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 6A0KBcxGnGO+kwAAbAwnHQ (envelope-from ) for ; Fri, 16 Dec 2022 11:22:04 +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 GMJEBMxGnGOMRwAAG6o9tA (envelope-from ) for ; Fri, 16 Dec 2022 11:22:04 +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 994C42D961 for ; Fri, 16 Dec 2022 11:22:03 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p67qI-0002ES-44; Fri, 16 Dec 2022 05:21:26 -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 1p67qD-0002E6-Dq for help-guix@gnu.org; Fri, 16 Dec 2022 05:21:21 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p67qB-0006A5-Cn for help-guix@gnu.org; Fri, 16 Dec 2022 05:21:20 -0500 Received: by mail-wr1-x432.google.com with SMTP id o5so2031053wrm.1 for ; Fri, 16 Dec 2022 02:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=feVj/UARU29RQJKzZ9tAOmjVFTMVCbCSQAMVqbZpO/k=; b=qukXGinEzG/kHDg+g4Sxr5mxYJLi3Ao5xOUY6+mcjHAZ5ZBgO0Mca3VfLiZ2mobfir JuB1YdHBUz0YRstotIIBsXdoDdSaJPCltNuTJhatqC0+MOvMOlNU7jcBYui8/W63uSNZ gNM6zesVncAGth5jkvZ+P1ExitvxEMwWhkZt+1n9XVrzEX7g+XwhEVfoYQ5ttOJUX6HS QpvrvgaXWLNI99rraPb/iwuyeMeg35Ze29kw0mn/QBpMhaHG1oc1TR7AIO8gw0BYLchG 71W/CPh9vxxgeuf+BTUrNLtJOaNZlkciuNdHeIDQnDCi9j03x6BEzc2bUU+s+QXPsLIp IZMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=feVj/UARU29RQJKzZ9tAOmjVFTMVCbCSQAMVqbZpO/k=; b=nczE8I1InQ1rH12ZwqHxIAYfpTFcYzXkdZRs7oDr88KRJs3Or1VtPSV0zaj/gfxJLk t4gSqJcaM6I/345LLAX6QT+Zy1PTkqrCnNgPOxpJ85Cw3kmPBe+j/jpJqoZWeevklM4U +vnvDFq3A56Bt/AHrcQ0KpN0iIe9ztqWb7WfIyTQ4Yg11JcWfgcXbX05NrYxBC7/VSgK AmJw1uhV7HZSdZK8Bpg/9f8hwVfevhmbHi3YJlAVAcm5CJZQ2hrERT0fDzrUi/n+vHpW iPFlIyxxv3C3WlgNoy1y/pOsm998YnZeQCBQj2J5LJpWsY3xypzqceE+0OyZG4FXSe67 kD+Q== X-Gm-Message-State: ANoB5plhao2t6t2u59Q5Y04+2T1r2VFwJDPs3Q2uHY1bOhcseFOABseu Njl89MW4PXpODKMb/jxiQNsvwqaAYvc= X-Google-Smtp-Source: AA0mqf5CgOjDwwtKEq5PdcQcEoC5wFPaLosia0awKCNCYW8z/ywFm+H90pIPnniJ7eo3wbtrB5HYWw== X-Received: by 2002:a05:6000:82:b0:242:14f2:a112 with SMTP id m2-20020a056000008200b0024214f2a112mr3688557wrx.3.1671186077305; Fri, 16 Dec 2022 02:21:17 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id p2-20020adfe602000000b002368f6b56desm2202033wrm.18.2022.12.16.02.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 02:21:16 -0800 (PST) From: zimoun To: calcium , help-guix@gnu.org Subject: Re: Can You Help With applying patches when doing `guix pull` ? In-Reply-To: <6b7b0cfa-a938-68ee-4a93-8ac0a942bd66@disroot.org> References: <6b7b0cfa-a938-68ee-4a93-8ac0a942bd66@disroot.org> Date: Fri, 16 Dec 2022 11:17:48 +0100 Message-ID: <86a63nveib.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: help-guix@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+larch=yhetil.org@gnu.org Sender: help-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671186123; a=rsa-sha256; cv=none; b=J+Hd81Xm7Q9+maqTsa/0mMQ/wqI7saM1l3vNbiOVPtiHIkxuLT0wogmv7soolYpvurIrBJ PxBNwuoSU8/Lz5hRSl5ZSe0YD4/21LU6LGQGkbW7fk1sH5wPLQb+ygbIn0+1nH+mKjmTor 1E+K5ouCrXH8o2wuCDIue7GtLO0olwrD4nSUFbig1vQuIKQWt2C8IALwu0Srmy74T3dc3w 33JruqZlrFvpagun8pQC2U3jL+q3rWNH37YRtJ6tiwYmb/zVW0CtR/hraHUWK+Twuegsgi t2cmsW9jVYzD7kJ9VX9LYZ3y9bzpJyBtOs0egKLPzduX+E4OAH7r+w54W1Xy2Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qukXGinE; spf=pass (aspmx1.migadu.com: domain of "help-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="help-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671186123; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=feVj/UARU29RQJKzZ9tAOmjVFTMVCbCSQAMVqbZpO/k=; b=ZulcxGQiQQPGcFX43o5IJeb+dMDccsUYGPU3GN6m2JOUz9k6mM3WWT+fLrPna/G7IBxQKL Up3W06uEc9hoTLWIQkIhyhOFptrVBEA8J3RBcFkfPPUG6lI7qAwivOigU9TOWxITEfB4fK vazq97/9IEFa9xCFLnNrfh0kisuMYlowoGnrocNjKl6zDGTyhYEmTv7WPtjG/aOIksu7Wk mxDiDkE5qClaRXmbx+i/AH5f97dmnS96091FJb+jQFH77NVftLIQ/IK+/1fqNcETAknjDN p5LEdvTaGJ+3cGfedsbShaYnULDOhL2QIKOI5sliM/jOsJVGPhQgEs31ygzgLQ== X-Migadu-Spam-Score: -4.96 X-Spam-Score: -4.96 X-Migadu-Queue-Id: 994C42D961 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qukXGinE; spf=pass (aspmx1.migadu.com: domain of "help-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="help-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gmail.com X-Migadu-Scanner: scn1.migadu.com X-TUID: 2uYO22Ty4X+K Hi, On Thu, 15 Dec 2022 at 14:22, calcium wrote: > Is there an easy way to applies patches locally (at every pull) > without having to maintain a whole channel ? As far as I know, no it is not possible to patch at the channel level (patch the package definition). And as you noticed, it is only possible to transform this package definition; guix build --help-transform). The only solution is to have another channel where the patches are applied. The new QA could do that for you; at least for one issue. For instance, --8<---------------cut here---------------start------------->8--- guix time-machine --branch=3Dissue-49946 = \ --commit=3D = \ --url=3Dhttps://git.guix-patches.cbaines.net/git/guix-pat= ches \ --disable-authentication = \ -- --8<---------------cut here---------------end--------------->8--- However, the QA is improving and sometimes, for some issues, there are some bugs (the patches are not correctly extracted or else). It seems the case here, a bug. Well, from my point of view, the use of =E2=80=9Cguix time-machine=E2=80=9D= would be the direction I would follow for your use case. Well, if the QA does not work perfectly yet, in the meantime, you can locally apply the patches you want and then run: guix time-machine --url=3Dfile:///path/to/the/local/checkout/containing/pat= \hes \ --disable-authentication = \ -- What is missing, IMHO, is a way to apply transformations to the channel when running =E2=80=9Cguix time-machine=E2=80=9D. For example, guix time-machine --with-patches=3Dguix=3Dfoobar.patch \ -- build emacs --with-patches=3Dtexinfo=3Dfixes.patch It had been already discussed several times but never implemented. :-) Otherwise, the usual way is to re-build Guix locally: git clone https://git.savannah.gnu.org/git/guix.git && cd guix guix shell -D guix git am ./bootstrap && ./configure --localstatedir=3D/var && make ./pre-env guix pull -p /path/to/other/guix /path/to/other/guix/bin/guix show tree-sitter-php where you probably need to disable the authentication and set up it. The former is affected by =E2=80=9Cguix gc=E2=80=9D, not the latter. Both = use the same idea: have another separated Guix profile containing the patches. Somehow, you are maintaining another channel. Cheers, simon