From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 10 11:13:50 2023 Received: (at submit) by debbugs.gnu.org; 10 Apr 2023 15:13:50 +0000 Received: from localhost ([127.0.0.1]:35664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pltDJ-0007GI-R2 for submit@debbugs.gnu.org; Mon, 10 Apr 2023 11:13:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:43162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pltDI-0007GB-Dc for submit@debbugs.gnu.org; Mon, 10 Apr 2023 11:13:48 -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 1pltDI-0003Hv-2b for guix-patches@gnu.org; Mon, 10 Apr 2023 11:13:48 -0400 Received: from smtpm1.myservices.hosting ([185.26.105.232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pltDG-000567-4A for guix-patches@gnu.org; Mon, 10 Apr 2023 11:13:47 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm1.myservices.hosting (Postfix) with ESMTP id 95B1920525 for ; Mon, 10 Apr 2023 17:13:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 3A6F5800A8; Mon, 10 Apr 2023 17:13:35 +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 kJ-eELBNxVyz; Mon, 10 Apr 2023 17:13:34 +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 B30DE800A7; Mon, 10 Apr 2023 17:13:34 +0200 (CEST) From: Bruno Victal To: guix-patches@gnu.org Subject: [PATCH] doc: Use G-Expressions for package definition example. Date: Mon, 10 Apr 2023 16:13:30 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.232; envelope-from=mirai@makinata.eu; helo=smtpm1.myservices.hosting 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_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 10 15:00:59 2023 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= Authentication-Results: mail-nwsmtp-smtp-production-main-60.sas.yp-c.yandex.net; dkim=pass header.i=@ya.ru From: Ivan Sokolov To: Bruno Victal Subject: Re: [bug#62754] [PATCH] doc: Use G-Expressions for package definition example. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62754 Cc: 62754@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 08:25:55 2023 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 To: 62754@debbugs.gnu.org Subject: [PATCH v2] doc: Use G-Expressions for package definition example. 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62754 Cc: Bruno Victal , ivan-p-sokolov@ya.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 21 04:22:00 2023 Received: (at 62754) by debbugs.gnu.org; 21 Apr 2023 08:22:01 +0000 Received: from localhost ([127.0.0.1]:39231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppm1o-0000Sb-KM for submit@debbugs.gnu.org; Fri, 21 Apr 2023 04:22:00 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:41119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppm1m-0000SL-M0 for 62754@debbugs.gnu.org; Fri, 21 Apr 2023 04:21:59 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id B58B640004; Fri, 21 Apr 2023 08:21:51 +0000 (UTC) From: Nicolas Goaziou To: Bruno Victal Subject: Re: [bug#62754] [PATCH v2] doc: Use G-Expressions for package definition example. References: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> Date: Fri, 21 Apr 2023 10:21:50 +0200 In-Reply-To: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> (Bruno Victal's message of "Tue, 11 Apr 2023 13:19:15 +0100") Message-ID: <87edod63xd.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62754 Cc: 62754@debbugs.gnu.org, ivan-p-sokolov@ya.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Bruno Victal writes: > + (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}. I think it still makes sense to refer to `inputs'; it could be unsettling otherwise. Maybe something along those lines: ... introduced with @code{lambda*}; it looks for the @file{xmllint} executable in a @file{"/bin"} directory among package's inputs (@pxref{package Reference}). It also honors the @code{outputs} parameter we have seen before@xref{Build Utilities}, for more... WDYT? Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Fri May 05 10:16:54 2023 Received: (at 62754) by debbugs.gnu.org; 5 May 2023 14:16:54 +0000 Received: from localhost ([127.0.0.1]:57190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puwEv-0007yS-Vl for submit@debbugs.gnu.org; Fri, 05 May 2023 10:16:54 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:38928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puwEu-0007y7-OC for 62754@debbugs.gnu.org; Fri, 05 May 2023 10:16:53 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3f16f792384so3680655e9.0 for <62754@debbugs.gnu.org>; Fri, 05 May 2023 07:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683296207; x=1685888207; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/6e457Vs3eSiSn2Dd81AeBJq9CWwiU1CzE+VJHAJQaU=; b=R0KgCdRDtusXz9D8WpQIsE/ybXWv12FYNA6eJbZ+27XVASXDcYtXxxuu3QAgP5Fm6v UV2FCttL8F2WVkbDMNCeXqlbvMHRyjl3KPvwULvX49SrHqHLYxiTOfk9JyxCT5vj2gZm frm8H7R20m1awIo4PxngoJ1w8iOVX+xyg0HC7/rqXQsa6YmGWQN7ONR77ZJZzS4JFHQF p3khP+TxeT4u8BYszCYbhpE3F2LEvFhTOQ3+8Vj8JfyRgoC8CEzMf2vk6+Q+j1tX+DBN VUJfWMcQrw3qQzYgk+DiMs4inW8SiFUOpWalX6riUIJtNg41r/wKLA2yKqA5XGFk8kP2 4IrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683296207; x=1685888207; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/6e457Vs3eSiSn2Dd81AeBJq9CWwiU1CzE+VJHAJQaU=; b=lcurdhm11ZeDXOBHzttfnH7Aw/KQyrXOe5QbmS7rO+27zXsLIO1klEwRl6OtQuoh+w ipmjE1n4KIxSH6QlIViyETYLZ0CnZIn1DXIOIrN96t89I1aqfSJ7WFfymkz0wOJPgZ6P eH1j6Y1amlWY7SWygWCuauGpUFyb/bl70vsPOWTF1k43mGnpb1GcNNdrzmdfzrJkILqM hPCj6Gi1224e9QDNgQhcOx1MjBRjHeSYgGfHzu2Aan3WQwJjosmbycuIoAjOPj9mZS9O KSFAfDDU9+GlpM8YW/7ij54EvihbJpRSON7w1LEFRlhb+D0ZWc3hdk5GdypzASpbdqXT 5mBA== X-Gm-Message-State: AC+VfDwdmixwR5h5mKALzFzbUVqhnOSqI+jOFn5fd5O9Dt8V/NQeceav yP2JL0DcnxFK5H4gu9Rz/Zk= X-Google-Smtp-Source: ACHHUZ5O+HppHkeMvnU24EyI527KrzU06Mq+VmQ4vLC77gUpMEna7aJcFSPxzyYaR37GrqgnR5o7fw== X-Received: by 2002:a05:600c:3ca4:b0:3f1:7138:91ee with SMTP id bg36-20020a05600c3ca400b003f1713891eemr1227212wmb.2.1683296206807; Fri, 05 May 2023 07:16:46 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id w3-20020a05600018c300b002fe96f0b3acsm2581085wrq.63.2023.05.05.07.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 07:16:46 -0700 (PDT) From: Simon Tournier To: Nicolas Goaziou , Bruno Victal Subject: Re: [bug#62754] [PATCH v2] doc: Use G-Expressions for package definition example. In-Reply-To: <87edod63xd.fsf@nicolasgoaziou.fr> References: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> <87edod63xd.fsf@nicolasgoaziou.fr> Date: Fri, 05 May 2023 16:06:02 +0200 Message-ID: <87fs8a7u0l.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62754 Cc: 62754@debbugs.gnu.org, ivan-p-sokolov@ya.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On ven., 21 avril 2023 at 10:21, Nicolas Goaziou w= rote: >> 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}. > > I think it still makes sense to refer to `inputs'; it could be > unsettling otherwise. Maybe something along those lines: > > ... introduced with @code{lambda*}; it looks for the @file{xmllint} > executable in a @file{"/bin"} directory among package's inputs > (@pxref{package Reference}). It also honors the @code{outputs} > parameter we have seen before@xref{Build Utilities}, for more... This tweak looks better to me. Well, Bruno could you send a v3? Or Nicolas, could you amend the patch and directly apply it? (Note the typo in =C2=AB before@xref{Build Utilities} =C2=BB, I guess.) Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 10:27:24 2023 Received: (at 62754) by debbugs.gnu.org; 6 May 2023 14:27:24 +0000 Received: from localhost ([127.0.0.1]:35508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvIse-0002em-DX for submit@debbugs.gnu.org; Sat, 06 May 2023 10:27:24 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:60638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvIsc-0002ee-Tb for 62754@debbugs.gnu.org; Sat, 06 May 2023 10:27:23 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id 5BFE7206A4; Sat, 6 May 2023 16:27:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5D93B80098; Sat, 6 May 2023 16:19:44 +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 EvlnLqOIV3Zx; Sat, 6 May 2023 16:19:44 +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 B2FF380097; Sat, 6 May 2023 16:19:43 +0200 (CEST) From: Bruno Victal To: 62754@debbugs.gnu.org Subject: [PATCH v3] doc: Use G-Expressions for package definition example. Date: Sat, 6 May 2023 15:19:40 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> References: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62754 Cc: Bruno Victal , mail@nicolasgoaziou.fr, zimon.toutoune@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/guix.texi (Build Phases): Use G-Expressions for example. Co-authored-by: Nicolas Goaziou --- doc/guix.texi | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 55221a10c3..e4b664aba9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10140,23 +10140,31 @@ 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*}; it looks for the @file{xmllint} +executable under a @file{/bin} directory among the package's inputs +(@pxref{package Reference}). It also 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}. @cindex code staging @cindex staging, of code base-commit: 1cb0dee3a31c6d235389d4d9787fa583c2babc30 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 12:08:39 2023 Received: (at 62754-done) by debbugs.gnu.org; 6 May 2023 16:08:39 +0000 Received: from localhost ([127.0.0.1]:35605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvKSc-0005co-Nw for submit@debbugs.gnu.org; Sat, 06 May 2023 12:08:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvKSa-0005ca-Tq for 62754-done@debbugs.gnu.org; Sat, 06 May 2023 12:08:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvKSU-0006k0-Re; Sat, 06 May 2023 12:08:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=1SNkyK0txmtqkYEZAhscHP5Kn5bfFGmCPSEdKPgF6B0=; b=jk5lOM4kvOo0jQADTofZ RDeVsGBH/Zv+56Pfqi4lHjT7mtBzJu8405ukDMuRNahrOiZio7sSPWbclSOMZW9bnFqMiQn7fvYRR M9xEbPEKEGI+VpKS4zei5Gx0+7n3rOUbSqoLyzCrIvBof2bCEH094rh1LEPuFWkUDZjX5Ap43qYKd qYR25irfTT8owB/9EB+tucfTB3yFGmWrm1U0Tuf8xvCiWRndX34ILOS064FaoFfyPmKpGc6wCZsHc FDkLzGnfkVhOF7dNvoEzdZ53NbNFzjyA0kwCAsbdqPxkCn6eEcw6DJChyzoyppb1GK58Nc3QeVEkf lSFuZMsHUFZRTg==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvKSU-0006oJ-FK; Sat, 06 May 2023 12:08:30 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Bruno Victal Subject: Re: bug#62754: [PATCH] doc: Use G-Expressions for package definition example. References: <2db67ea84f7a23bf04280ad1e365ac8709167d66.1681215490.git.mirai@makinata.eu> Date: Sat, 06 May 2023 18:08:28 +0200 In-Reply-To: (Bruno Victal's message of "Sat, 6 May 2023 15:19:40 +0100") Message-ID: <874jopl9xf.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 62754-done Cc: 62754-done@debbugs.gnu.org, mail@nicolasgoaziou.fr, zimon.toutoune@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Bruno Victal skribis: > * doc/guix.texi (Build Phases): Use G-Expressions for example. > > Co-authored-by: Nicolas Goaziou Applied, thank you, and thanks Simon and Nicolas! Ludo=E2=80=99. From unknown Sat Jun 21 05:15:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 04 Jun 2023 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator