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 eOFLBf38rmMgkwAAbAwnHQ (envelope-from ) for ; Fri, 30 Dec 2022 16:00:13 +0100 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 AKJKBP38rmPkRgAAG6o9tA (envelope-from ) for ; Fri, 30 Dec 2022 16:00: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 AA1F83AE17 for ; Fri, 30 Dec 2022 16:00:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBGqp-0000zD-Lp; Fri, 30 Dec 2022 09:59:15 -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 1pBGqd-0000mN-Iz for guix-patches@gnu.org; Fri, 30 Dec 2022 09:59:04 -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 1pBGqd-0000eu-BB for guix-patches@gnu.org; Fri, 30 Dec 2022 09:59:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBGqd-0007PZ-7X for guix-patches@gnu.org; Fri, 30 Dec 2022 09:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60013] [PATCH 1/3] gnu: Add libmodule Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 14:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Florian , 60013@debbugs.gnu.org Received: via spool by 60013-submit@debbugs.gnu.org id=B60013.167241229628405 (code B ref 60013); Fri, 30 Dec 2022 14:59:03 +0000 Received: (at 60013) by debbugs.gnu.org; 30 Dec 2022 14:58:16 +0000 Received: from localhost ([127.0.0.1]:35903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBGpr-0007Nu-OW for submit@debbugs.gnu.org; Fri, 30 Dec 2022 09:58:16 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:51182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBGpp-0007NS-Hq for 60013@debbugs.gnu.org; Fri, 30 Dec 2022 09:58:14 -0500 Received: by mail-wm1-f41.google.com with SMTP id m3so6427671wmq.0 for <60013@debbugs.gnu.org>; Fri, 30 Dec 2022 06:58:13 -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=TwQ1t6xYO90UdVAH7xUrdEK4Axaix2peTtFONcZWoUU=; b=kGjskjr5Wr6BHtghFPAqV2YmqqturaqVFS3iREP40Xw1+6WREWg3vGt5nQHhSoKa6E 1/a7FQmMc2cnnvgOMTBs6/zZRwleKvPtzPfUzHLPvSYWFrxtZtR8L5chDCPykHysIhbc k4tah321VDKG43QCe40VKCnxcbUGlk5Ub2n14XuI7Qg8uqKeyjrm6Tue+2GhRljeIxB0 QCQA+PgZx0/BJHbsOPbFlQM6PTBUj8Vz4NuJvqiNsKQAVNiwupBL+gPC9MvtmNbjIp8c CuOk49z+vspuE4k2bOWb8DYSuNjfXVrus4YVqF4tlsUjNRkcqyira53bJEttnuJcxMzb aOHw== 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=TwQ1t6xYO90UdVAH7xUrdEK4Axaix2peTtFONcZWoUU=; b=ioj/ClDHHG7/KwLS4kVCeEF22zK0eJ+M2kkgpTos1M7bpP0mxVo8z5x81sOgs2BLA6 xpr+/4Lly+lyQo/ilqyvLy6/G1r2Pr29bGRIMQqUIAcsZXic1c7aB8iozsHZIvog6/tX G/ORfL1n/ScA9VaFsVkYPPxG382vUDHO366BjtxLsSgKt/YQjHkIe3+RFOFn+IC5oeZ5 OuRnv3uq3yMZ5LkoAtoWNgnEaNZHRR0Z3l2YshXlnJziJc6dFN/xRHthEW42C75ffqvv oxBpAfxCEj7IYJJVJINLhXGvMyTY1O5aN7eDO6yXC4phACw4otUQvuR7t6kWYktgzHR0 mPbA== X-Gm-Message-State: AFqh2ko8/ZsfTy74HmR5eLiWUwEEZAIBSoYQyvT4es3u878Z84jEFeP3 b2MQxtGmqj2h+g6vetgPS7axSFTduiE= X-Google-Smtp-Source: AMrXdXsODKcA0xZ7xlc42GOQVY3jXEQGv4YxusawFIxZcdA7wdDA6Hq//tEybj3WbDoDiNyN8IDrCQ== X-Received: by 2002:a05:600c:1d15:b0:3d5:b45a:d792 with SMTP id l21-20020a05600c1d1500b003d5b45ad792mr6182011wms.0.1672412287996; Fri, 30 Dec 2022 06:58:07 -0800 (PST) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id j6-20020a056000124600b0029100e8dedasm1016889wrx.28.2022.12.30.06.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 06:58:07 -0800 (PST) From: zimoun In-Reply-To: <871qounifm.fsf@posteo.net> References: <87edt47ecz.fsf@posteo.net> <91575b0f95b5a71b18108b57fa1a366e0f6044c9.1670876889.git.florhizome@posteo.net> <86tu20b2uu.fsf@gmail.com> <87tu1zr072.fsf@posteo.net> <86pmckdhts.fsf@gmail.com> <871qounifm.fsf@posteo.net> Date: Fri, 30 Dec 2022 13:45:30 +0100 Message-ID: <87k029kql1.fsf@gmail.com> 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: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672412412; 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: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=TwQ1t6xYO90UdVAH7xUrdEK4Axaix2peTtFONcZWoUU=; b=fjyoEqyeklNv1ZzvRQpgJebJpV7qQxXTrtqVsFMR+1qEeXR2tXu8lSHmevnus51qwgFDTM +m/S0+6BlfrPmt+iaOGT3B87sEQU0IVK0Sf91Vxoe/AKcByr+f+kBpZM5S6DaTIsyBG/6X QjTIvKNAay8x7ipIonqrzQqoGMuYnMFE+h8we7FNvBzMFVpYiVob0HCw1keQznTQiI6AFw 7uKm1r8QnbXuFofSIhT1kokeVCtAtXWLNTlk+iaf6xuRhsLIncVb+Gi4JBkWZhjRMolxU3 wo4f+EoawuKRNRUKStXLliSmI/w3oJE/gHQmoTqp+9n2934JzuLEoNfijMzXHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kGjskjr5; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672412412; a=rsa-sha256; cv=none; b=kr5klPvQA1ZpeJtCednHLwZFMTTLmmWNIGD8ZRY+gO01GzvoENoOO3OR9AgHykLheurtKh T/rr7rhf7mHzJ8EV312aPhRfwJ0nTnQp+YluQgr/6H1xCf9Ak9tSA6p0q/FFRu5qqb6tBo WgRuz1CgAPc1V3JpoANqG/UdQECC/JZaMOlJOVBHrbOluPmP2TDqnX87INJxi1R9AxUtOS MaDCY96gREBkWDchEjsF+9prgEtv+/dAXvA78uKnRZ7sn969dS/EQQQ8Zen/4s+EAo5/Vr HqEHfmfUvEKWSGeYinP3TSooGUZgK/kwqJgmDDQGFZcp019STcnVQELKDhX5vw== X-Spam: Yes X-Migadu-Queue-Id: AA1F83AE17 X-Migadu-Spam: Yes X-Spam-Score: 7.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=kGjskjr5; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 7.47 X-TUID: 4O7qrwiC++Cx Hi, On Tue, 20 Dec 2022 at 16:33, Florian wrote: > Creating a branch, yes, but continuously rebasing them all and recompilin= g before > working on each single commission: yes (building guix is pretty time > intensive). This is where I think guix lacks a proper CI/CD. That contrib= utors > even have to check if a patch applies, if it builds and run guix lint > seems paradox to me, especially with the capacity problems that already e= xist > when accepting submissions. Are you aware about ? And for what it is worth, your submission [1] fails with the Guix CI/CD. Probably because your patches do not apply correctly. 1: What I was suggesting is not to rebase and not to rebuild but instead to cherry-pick and then correctly format patches. Please note that this comment applies equally for any workflow =E2=80=93 even for some PR workflo= w =C3=A0 la Git{Hub,Lab}. > I think the problem you have comes from multiple patches of mine being in > wm.scm which has also made rebasing more complicated. Git really seems > to struggle when patches have hunks in one file that might touch each oth= er, > that I haven't really understood how to avoid. but I can check > one more time. Maybe we could have a look at how the patch is failing? As pointed in [1], the patch just does not apply, --8<---------------cut here---------------start------------->8--- error: patch failed: gnu/packages/wm.scm:102 error: gnu/packages/wm.scm: patch does not apply hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch Applying: gnu: Add clightd Patch failed at 0001 gnu: Add clightd --8<---------------cut here---------------end--------------->8--- because of gnu/packages/wm.scm:102. From my understanding, it is not about rebasing, it is about which state of the file the diff must apply against. What I was suggesting is to extract these 3 patches using cherry-pick and so format the patches against a clean origin/master. For instance, --8<---------------cut here---------------start------------->8--- git checkout -d example git reset --soft 0ce1f82e5aaac951b21d579eb46bf75cfe6713c0 git cherry-pick 5ad571d5a145a7a33ec9241bf75f25cf4864e629 git cherry-pick git cherry-pick git format-patch -3 --cover-letter --base=3D0ce1f82e5aaac951b21d579eb46bf75= cfe6713c0 git checkout master git branch -D example --8<---------------cut here---------------end--------------->8--- where 0ce1f82e5aaac951b21d579eb46bf75cfe6713c0 is a clean =E2=80=99origin/master=E2=80=99 when you created this patch set. And where 5ad571d5a145a7a33ec9241bf75f25cf4864e629 is the commit adding libmodule. It changes nothing for you, IMHO, and it helps for having patches which correctly apply; although you still have other unreleated patches. 1: Cheers, simon