From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 0P5cEIiF8WJfXAEAbAwnHQ (envelope-from ) for ; Mon, 08 Aug 2022 23:52:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gINQEIiF8WLKKQAAauVa8A (envelope-from ) for ; Mon, 08 Aug 2022 23:52:08 +0200 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 F335F22D19 for ; Mon, 8 Aug 2022 23:52:07 +0200 (CEST) Received: from localhost ([::1]:41232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLAfO-0002Oa-OV for larch@yhetil.org; Mon, 08 Aug 2022 17:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLAea-0002La-Rd for guix-devel@gnu.org; Mon, 08 Aug 2022 17:51:16 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]:53020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLAeY-0003tG-Cx for guix-devel@gnu.org; Mon, 08 Aug 2022 17:51:16 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id DEB7E614; Mon, 8 Aug 2022 23:51:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gk_mk9WAbYJe; Mon, 8 Aug 2022 23:51:09 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0:bad0:add3:e270:17e5]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 9280A2B1; Mon, 8 Aug 2022 23:51:08 +0200 (CEST) Date: Mon, 8 Aug 2022 23:51:07 +0200 From: Andreas Enge To: Maxime Devos Cc: Guix-devel Subject: Re: v2: A proposal of a consistent set of clear rules and guidelines involving snippets, phases and patches. Message-ID: References: <98da36a2-d0cc-77da-77bf-6984253131ac@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <98da36a2-d0cc-77da-77bf-6984253131ac@telenet.be> Received-SPF: pass client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659995528; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=49W5+8dFP/vCfq80wmg8BzzkgllWUmbX1M1icBKwb9M=; b=Oa548ORElQgR2UADEnSZLV3NbW0TV4OuZ8LTKwvDZ+U2ugdzUKNwNNGn0BT8/GfXaOFT0I JCXVgtnUbK4VfZLjzNviWdkyDD3z92A+CYJYm55tQ3vbJSEZw7Wxqpe17AdljoavWBb+qu 2ttv2rl/LKQc1PdREEVnCKO4Qg1GPUFgNzFCQwNfwtfdy4AXVT2BZOPZpK6/YiCPp14eVt ivpWfYTUwOCsaE/RD6iktS6/OUh6eaR4BNS/O88mvaDRwKMo9WmYE+JuiIbhEWuUh0RW1c TKiLQWRoAXs2yyB+KUJOjstQAXa5srFyS3MBvwGiVsmBK1+OVvBQ29iO2GP8+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659995528; a=rsa-sha256; cv=none; b=l05kRRk6P8nxZAiLsTO3mol+gezQIEbmmnxxG3pAsHuFKILToRjn05qEJbFnt8YgiPi1aP bd7aZYmSMCBXDbefw4Fl4gznaU/81hSssnwG7MhOrkirtM1FLs+UMK8DvPNS0cy85YjrPM 5BGLYMpRkk9v6k28t9RiFGOThIDWqFlrLbvb+51ZhhV3IA0u4BsH83VzVQkSXQG22I/OSL wGmsUQvItKOlyDaPXS5wVMMXPaFAt38OqRqJVEeDOz2VWBBhGmCYTQ3bqznG/RUJ+uH1Ss aY5TNvXFwsd+sJFXN/k34nBlPNwUp+YRyJ3RdAO/k8ISgmGp6qFmh38PwgliBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.19 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: F335F22D19 X-Spam-Score: -3.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: WlwUVSy/IdMs Hello, Am Fri, Aug 05, 2022 at 03:59:14PM +0200 schrieb Maxime Devos: > Here's a v2. I've changed the structure to something close to what Julien > proposed, it looks a lot better now to me! thanks, it does! I still find it a bit too verbose compared to Liliana's suggestion, which I would prefer as a starting point of the discussion. > 20.4.5.3 Fixing technical issues (compilation errors, test failures, other bugs > ...) > Usually, a bug fix comes in the form of a patch copied from upstream or another > distribution. In that case, simply adding the patch to the 'patches' field is > the most convenient and usually does not cause any problems; there is no need > to rewrite it as a snippet or a phase. > If no ready-made patch already exists, then choosing between a patch or a > snippet is a matter of convenience. However, there are two things to keep in > mind: > First, when the fix is not Guix-specific, it is strongly desired to upstream > the fix to avoid the additional maintenance cost to Guix. As upstreams cannot > accept a snippet, writing a patch can be a more efficient use of time. > Secondly, if the fix of a technical issue embeds a store file name, then it has > to be a phase. Otherwise, if a store file name was embedded in the source, the > result of 'guix build --source' would be unusable on non-Guix systems and > likely also unusable on Guix systems of another architecture. Do you mean "phase" here instead of "snippet"? That is what I usually do... My practice is to use a patch when the goal is to eventually change the source code upstream (or it is already changed upstream and we can take a patch from their git repo, say), and a phase when one cannot expect upstream to incorporate the changes since they are specific to Guix (like embedding store paths, as Liliana writes, where apparently a phase is the only option anyway). Andreas