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 wMClAYFRZmMNnwAAbAwnHQ (envelope-from ) for ; Sat, 05 Nov 2022 13:05:21 +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 yPjZAIFRZmORBgEAG6o9tA (envelope-from ) for ; Sat, 05 Nov 2022 13:05:21 +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 ADA1916B08 for ; Sat, 5 Nov 2022 13:05:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orHvD-0006Mq-A9; Sat, 05 Nov 2022 08:05:11 -0400 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 1orHv5-0006G7-1i for guix-patches@gnu.org; Sat, 05 Nov 2022 08:05:07 -0400 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 1orHv4-0000uk-On for guix-patches@gnu.org; Sat, 05 Nov 2022 08:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orHv4-0004hM-Io for guix-patches@gnu.org; Sat, 05 Nov 2022 08:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59048] [PATCH] guix: modify-input: Recommend prepend instead of append. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 12:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59048 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59048@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166764987318020 (code B ref -1); Sat, 05 Nov 2022 12:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Nov 2022 12:04:33 +0000 Received: from localhost ([127.0.0.1]:55804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orHua-0004gZ-MJ for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:04:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:36004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orHuX-0004gP-Cx for submit@debbugs.gnu.org; Sat, 05 Nov 2022 08:04:31 -0400 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 1orHuM-00067c-SS for guix-patches@gnu.org; Sat, 05 Nov 2022 08:04:26 -0400 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1orHuG-0000nZ-GB for guix-patches@gnu.org; Sat, 05 Nov 2022 08:04:15 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 4eeafa32 for ; Sat, 5 Nov 2022 12:04:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:to:message-id:mime-version; s=dkim; bh=SorpS2y7A5J 4gvJvyii6KrNS/1w=; b=sF+a6E2x51DQ2eXgH1PxuF5+5oNVpKG/w0F4kjxutjx x/kim2SsqMxbs7aKJfRSs/lpxxXvvTm+vvJMQuOuNOYBir7Ka8cIU9sNXWlb8Pvc svYWKkXddLuoHh4sqAJdVlzTIgmCwMiD5jOQZy87khHEr4jYk7SR/S4GgYovzTjw = Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id b25f17b8 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO) for ; Sat, 5 Nov 2022 12:04:01 +0000 (UTC) Date: Sat, 5 Nov 2022 12:59:01 +0100 Message-ID: <7c0fbbe321c736a5757c637b33bf3a9909a6f63e.camel@planete-kraus.eu> MIME-Version: 1.0 User-Agent: Evolution 3.46.0 Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Sender: "Guix-patches" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667649920; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=5gBsFPqdBQEnBP/TceyFPvtSZvtkuIVV+vZ3KA+XqJ4=; b=snMZd2fxrkI/KWGIgWL1tF1+f3S/3Cgt3Qkh/t7J0ns7yv/2jPHaU9A/DzF+RBT1vJL6j3 FA+C2bQmyiBoTgTvCauefO1XxNUSlmDXLyh12clE8Ppd8hFNyOfOrVAdb9pF5KyzypiBF9 hfpkwNzhfXNG7lTxbErARIbkoojdqpaGvVGb8xogTrFb7Yh31X6XRgZA6JavHQaE2oKbIZ Ag86QrTEqk1owqNZGDOnMseo86BHs0eGmwOY1YLU+bCeth5xUQSuxpCpNLy/RuqL91vpkX Grg/C1Y6GWBNhIWD+y3Yu0qU5q32c9HpJg3am2tn3Hb7DdSgv/ofLP/xNMFjQw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667649920; a=rsa-sha256; cv=none; b=YIo/6VNGva+bXXHOt5GIskezwzMWUltRdfp5hlhpJ/nvu5Ha7E7Vqrj+4XxR+HJoL44N9+ XaZ1rWCrcMHCQmfPjQZoY4NWKM94T6RidrfFr7RjQY0UBe6QQAETKQOa2ixpdtGqCA5H1G 6sv5HWk1INOTUXAYbz6EuPF4JPxLRWu0447CNDzLZ/0g2Lf7HzxpefHmHeqTX3Sa+AlKc2 mZnHIKWTIBXwtLPPlCCWe+JEIsg2L8o8OfQVon0BSkUScGo//IikGmLtT+vylHMx4E8TyC 0BQWGPZ5WsftNCOt3gV1kR6y+QwV8DtqQvi9iVHt90PxV8ZFYZdIY0V34kM3EQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=sF+a6E2x; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -2.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=sF+a6E2x; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: ADA1916B08 X-Spam-Score: -2.21 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3RDxBGHUFPTb * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of modify-inputs first. * guix/packages.scm (modify-inputs): use "prepend" in the docstring. --- doc/guix.texi | 12 ++++++------ guix/packages.scm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7806b21a0f..f818643ecd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8057,20 +8057,20 @@ following forms: @item (delete @var{name}@dots{}) Delete from the inputs packages with the given @var{name}s (strings). -@item (append @var{package}@dots{}) -Add @var{package}s to the end of the input list. - @item (prepend @var{package}@dots{}) Add @var{package}s to the front of the input list. + +@item (append @var{package}@dots{}) +Add @var{package}s to the end of the input list. @end table The example below removes the GMP and ACL inputs of Coreutils and adds -libcap to the back of the input list: +libcap to the front of the input list: @lisp (modify-inputs (package-inputs coreutils) (delete "gmp" "acl") - (append libcap)) + (prepend libcap)) @end lisp The example below replaces the @code{guile} package from the inputs of @@ -8081,7 +8081,7 @@ The example below replaces the @code{guile} package from the inputs of (replace "guile" guile-2.2)) @end lisp -The last type of clause is @code{prepend}, to add inputs to the front of +The last type of clause is @code{append}, to add inputs at the back of the list. @end deffn diff --git a/guix/packages.scm b/guix/packages.scm index 704b4ee710..502df7fdd1 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1176,9 +1176,9 @@ (define-syntax modify-inputs (modify-inputs (package-inputs coreutils) (delete \"gmp\" \"acl\") - (append libcap)) + (prepend libcap)) -Other types of clauses include 'prepend' and 'replace'. +Other types of clauses include 'append' and 'replace'. The first argument must be a labeled input list; the result is also a labeled input list." base-commit: 84d239599a10f31e7d414d962ae25888ab21165c -- 2.38.0