From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CCI2IutRNWQEEwEASxT56A (envelope-from ) for ; Tue, 11 Apr 2023 14:26:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WJxdIetRNWSUCAEAG6o9tA (envelope-from ) for ; Tue, 11 Apr 2023 14:26:19 +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 22B672F926 for ; Tue, 11 Apr 2023 14:26:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmD4W-0004Wi-Hx; Tue, 11 Apr 2023 08:26: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 1pmD4V-0004WS-Hq for guix-patches@gnu.org; Tue, 11 Apr 2023 08:26:03 -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 1pmD4U-0007gi-NR for guix-patches@gnu.org; Tue, 11 Apr 2023 08:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmD4U-0003LP-90 for guix-patches@gnu.org; Tue, 11 Apr 2023 08:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62754] [PATCH v2] doc: Use G-Expressions for package definition example. References: In-Reply-To: Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 12:26: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: 62754@debbugs.gnu.org Cc: Bruno Victal , ivan-p-sokolov@ya.ru Received: via spool by 62754-submit@debbugs.gnu.org id=B62754.168121595512837 (code B ref 62754); Tue, 11 Apr 2023 12:26:02 +0000 Received: (at 62754) by debbugs.gnu.org; 11 Apr 2023 12:25:55 +0000 Received: from localhost ([127.0.0.1]:36842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmD4M-0003Ky-Lw for submit@debbugs.gnu.org; Tue, 11 Apr 2023 08:25:54 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:51486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmD4K-0003Kq-Fm for 62754@debbugs.gnu.org; Tue, 11 Apr 2023 08:25:53 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 4B4EE20F22; Tue, 11 Apr 2023 14:25:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C83DB800A3; Tue, 11 Apr 2023 14:19:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6dbYHUFjLuIg; Tue, 11 Apr 2023 14:19:29 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 442CD800A1; Tue, 11 Apr 2023 14:19:29 +0200 (CEST) From: Bruno Victal Date: Tue, 11 Apr 2023 13:19:15 +0100 Message-Id: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=1681215979; a=rsa-sha256; cv=none; b=kDzrTgG7lFvELDiRerGdAz5PDET7lTDROgZABbSfp1IaGsaJUAx+M1YgZGx4ubmT++HAHm 1icNhCXWa0Tr3LtaWkJ3Q+HbdzCF36MT2u7GHfq8Mb3ZRWNbxwkpT6dlRvhGWMxpzqlrD6 En9NuoIsHNL4dGxR64L9n364suetAk7RnD4efYW64GVizQAz0z5E/5iQ2oCrM8fhvS7GKG sRlaJfrP+Ef8YY0AYvnYT/yAGi/MkAFMa5HQP1ak9QyToaI19jBLxcrNTg2N/Rcxjn81QB FN/uv+Sl69ptJ+1u+m5/CEz3sn0be68euKFVsFg+6pD8Ch5ZbBn0SmTA0CD4YA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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=1681215979; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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; bh=waGT2QhC7b+Cw4HapnDrHrpybg/j8y8Fs5HWSQWBV0A=; b=B70GW4eRaSQdAsVRWHwoHk4NQvz7DdY6Zlb51nOf4X+SueidR1thJ377q66EPqZY9lyVOk tuqX73B1+/iRsogK7drTlJ28I3Vl6nuA7JKiLeAQbZwN+PgCEJ8aWB8JlosU9GgkcubRcI ai4iAlvqcIX3Bp32qcM8qd1ziZZKG8z+KH/DR/WC98+hRsy7NqhtCn5TRqQe4ubImhGAIx Fczo07WDVEZjRsdcZretWHsNYnrzgtTKKLH0SYVMHbs9FwkHFBsLUvO+HAcz6dj+0Qtmnb bEJVsw8gXgGiFThgFQ3j/504H1hU0saoVuw316OMG3avYzE2KzHFdX3Om4J+pA== X-Migadu-Spam-Score: -1.72 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: -1.72 X-Migadu-Queue-Id: 22B672F926 X-TUID: N+U/f+rXIAog * doc/guix.texi (Build Phases): Use G-Expressions for example. --- doc/guix.texi | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index fa6c9f46a3..62513a4182 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10131,23 +10131,28 @@ 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 #$output 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 -we have seen before. @xref{Build Utilities}, for more about the helpers -used by this phase, and for more examples of @code{modify-phases}. +introduced with @code{lambda*}. @xref{Build Utilities}, for more about +the helpers used by this phase, and for more examples of +@code{modify-phases}. @cindex code staging @cindex staging, of code base-commit: 0356087f4e669a79d62d413498c32e4ecb79ba6b -- 2.39.2