From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WEliH/hcNGSc2QAASxT56A (envelope-from ) for ; Mon, 10 Apr 2023 21:01:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id mC8tH/hcNGR9MQAAauVa8A (envelope-from ) for ; Mon, 10 Apr 2023 21:01:12 +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 0BB2130CB5 for ; Mon, 10 Apr 2023 21:01:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plwlE-0007AL-QV; Mon, 10 Apr 2023 15:01:04 -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 1plwlC-00079N-Fy for guix-patches@gnu.org; Mon, 10 Apr 2023 15:01:02 -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 1plwlC-0003dq-7o for guix-patches@gnu.org; Mon, 10 Apr 2023 15:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plwlC-0007we-3b for guix-patches@gnu.org; Mon, 10 Apr 2023 15:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62754] [PATCH] doc: Use G-Expressions for package definition example. Resent-From: Ivan Sokolov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Apr 2023 19:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62754 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 62754@debbugs.gnu.org Received: via spool by 62754-submit@debbugs.gnu.org id=B62754.168115325930527 (code B ref 62754); Mon, 10 Apr 2023 19:01:02 +0000 Received: (at 62754) by debbugs.gnu.org; 10 Apr 2023 19:00:59 +0000 Received: from localhost ([127.0.0.1]:35934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plwl9-0007wH-GG for submit@debbugs.gnu.org; Mon, 10 Apr 2023 15:00:59 -0400 Received: from forward500b.mail.yandex.net ([178.154.239.144]:58212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plwl6-0007w6-PL for 62754@debbugs.gnu.org; Mon, 10 Apr 2023 15:00:58 -0400 Received: from mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net [IPv6:2a02:6b8:c08:8212:0:640:cefe:0]) by forward500b.mail.yandex.net (Yandex) with ESMTP id 4A96A5ED51; Mon, 10 Apr 2023 22:00:54 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id m0a1LO8WxOs0-egRq9YtB; Mon, 10 Apr 2023 22:00:53 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ya.ru; s=mail; t=1681153253; bh=/lvA47LViTElDkrhB0+GqF8nCf3vdr9CXeDKWDxyPDM=; h=Message-ID:Date:Cc:In-Reply-To:Subject:References:To:From; b=iFHBZuwcMHzvcsLUCFuBnwiXtIx1gUfdS7RGkS7RcnIuX/1gnImwKVLgB3ampkg0r GCLnqVxALidsgn3JNMY0qKQmmmHDlUyJ/gHIkvVBhr7iBmVrWBvktJCNm1v1DbB2p3 wTGlH9yCr9SExFMdskOtD1JG+IKmWHxSIEwducYE= From: Ivan Sokolov In-Reply-To: (Bruno Victal's message of "Mon, 10 Apr 2023 16:13:30 +0100") References: Date: Mon, 10 Apr 2023 22:00:41 +0300 Message-ID: <873557r292.fsf@ya.ru> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-Seal: i=1; s=key1; d=yhetil.org; t=1681153272; a=rsa-sha256; cv=none; b=GU+SHNmuuasfh1K7JNGiiM/zYhWny8keqfEK08ma6q1Ko0s6gBjNd6MDzk6v/Sbu+3qQXI dNb0kxm3gjEjLO4xX6WDOkAbvBTpAxho/7BV+peDproUz2eu8wg2qVPJYBPGilo/Pfo90O CBHW30R6Ak+aJSwT1+3iAuvtpkTmXg1qZTke+A7t8jTXJn2QECJ5qjcYWpLRM3/DlWYhVA J3afPHmuMUgbn0K+viTIT1tUNPgrv0KTL6i8/cYWa4usiOQPXTBrnzjQaopGV/TSoweNks D/o8A7r/UWfU8ARQYoUqdLMupnyEDIlJng/y6xPhp5jH3FjpWvmpVzyt2JJzPQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ya.ru header.s=mail header.b=iFHBZuwc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=ya.ru (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681153272; 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: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=/lvA47LViTElDkrhB0+GqF8nCf3vdr9CXeDKWDxyPDM=; b=QJDERhq9jhbbvsJD3lBtC2yHoradiMgzG+7cd4Y5PJnKoNbl49SrNirRM+Ki8jKuPe6Kt2 gi6BcVzwDzDW1ZIqfXaeqPlJ+s2C8lEMdGBqf7LB1yhhZvvwVDrOzlYfeYoG5iKbeenQE2 nobdUe61UVkqCypeaOVj1+tx8f4z1vomA1FaZknjjLQN4j4fSBDcDWR8lhw1tFpAB8U+gX rDyIYF+2FQOyOz+bTyYhIpks1D4vHs0NejAagwWRjJOgxR0X4cZn79sk0hYRX8C2t+OQ03 MmQhsEbmUEXNOa7LdhkEOy9LQp3cEc+1/81cN7514s5igu00PUhz4Wsu64BPOw== X-Migadu-Spam-Score: 5.78 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ya.ru header.s=mail header.b=iFHBZuwc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=ya.ru (policy=none); 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-Spam-Score: 5.78 X-Migadu-Queue-Id: 0BB2130CB5 X-TUID: gZ6dhfkAsmAO Bruno Victal writes: > * doc/guix.texi (Build Phases): Use G-Expressions for example. > --- > doc/guix.texi | 29 +++++++++++++++++------------ > 1 file changed, 17 insertions(+), 12 deletions(-) > > diff --git a/doc/guix.texi b/doc/guix.texi > index ed42488882..100ad93a3e 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -10131,21 +10131,26 @@ Build Phases > ;; other fields omitted > (build-system gnu-build-system) > (arguments > - '(#:phases (modify-phases %standard-phases > - (delete 'configure) > - (add-before 'build 'set-prefix-in-makefile > - (lambda* (#:key outputs #:allow-other-keys) > - ;; Modify the makefile so that its > - ;; 'PREFIX' variable points to "out". > - (let ((out (assoc-ref outputs "out"))) > - (substitute* "Makefile" > - (("PREFIX =.*") > - (string-append "PREFIX = " > - out "\n"))))))))))) > + (list > + #:phases > + #~(modify-phases %standard-phases > + (delete 'configure) > + (add-before 'build 'set-prefix-in-makefile > + (lambda* (#:key inputs #:allow-other-keys) > + ;; Modify the makefile so that its > + ;; 'PREFIX' variable points to "out" and > + ;; 'XMLLINT' points to the correct path. > + (substitute* "Makefile" > + (("PREFIX =.*") > + (string-append "PREFIX = " #$output "\n")) > + (("XMLLINT =.*") > + (string-append "XMLLINT = " > + (search-input-file inputs "/bin/xmllint") > + "\n")))))))))) > @end lisp > > The new phase that is inserted is written as an anonymous procedure, > -introduced with @code{lambda*}; it honors the @code{outputs} parameter > +introduced with @code{lambda*}; it honors the @code{inputs} parameter > we have seen before. @xref{Build Utilities}, for more about the helpers > used by this phase, and for more examples of @code{modify-phases}. > > > base-commit: b78d6ceaa07be3c7582627cd28712b67102e521c inputs parameter has not previously appeared in the documentation, the sentence before last does not make sense anymore.