From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 23 02:45:48 2021 Received: (at submit) by debbugs.gnu.org; 23 Jun 2021 06:45:48 +0000 Received: from localhost ([127.0.0.1]:40310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvwds-0001x9-2l for submit@debbugs.gnu.org; Wed, 23 Jun 2021 02:45:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:49354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvwdq-0001x1-B6 for submit@debbugs.gnu.org; Wed, 23 Jun 2021 02:45:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvwdp-00037x-Ge for guix-patches@gnu.org; Wed, 23 Jun 2021 02:45:41 -0400 Received: from zancanaro.com.au ([45.76.117.151]:37592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvwdl-0004PD-C1 for guix-patches@gnu.org; Wed, 23 Jun 2021 02:45:41 -0400 Received: by zancanaro.com.au (Postfix, from userid 116) id 66AEE34D71; Wed, 23 Jun 2021 06:45:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on vultr X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from jolteon (n49-177-243-126.bla4.nsw.optusnet.com.au [49.177.243.126]) by zancanaro.com.au (Postfix) with ESMTPSA id 5197B34A69 for ; Wed, 23 Jun 2021 06:45:29 +0000 (UTC) User-agent: mu4e 1.4.15; emacs 27.2 From: Carlo Zancanaro To: guix-patches@gnu.org Subject: Fix missing phases in Emacs builds Date: Wed, 23 Jun 2021 16:45:28 +1000 Message-ID: <87k0mlaxkn.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=45.76.117.151; envelope-from=carlo@zancanaro.id.au; helo=zancanaro.com.au 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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.4 (--) --=-=-= Content-Type: text/plain; format=flowed Hi there! I went to install emacs-protobuf-mode today and found that the build wasn't working. I investigated and it looks like someone renamed the add-source-to-load-path phase to expand-load-path, but they left a few references behind. The first of my patches fixes that. The second of my patches is more controversial. It changes modify-phases to error out if the asked-for phase doesn't exist in add-before/add-after clauses. I think this is the right move, because it's hard to imagine when the default behaviour of "add to the end of the phases list" is helpful. In most cases the extra phases are setup/transformation phases that we need to run before the final "install" phase, so it's far more useful to fail early than to add these to the end of the phases list. Carlo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-Fix-references-to-emacs-build-system-s-expand-lo.patch From d07b375d6d0a1c354587b285a2547aee8f6e9f96 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Wed, 23 Jun 2021 15:57:40 +1000 Subject: [PATCH 1/2] gnu: Fix references to emacs-build-system's expand-load-path phase * gnu/packages/emacs-xyz.scm (emacs-pdf-tools): Change reference from emacs-add-source-to-load-path to emacs-expand-load-path * gnu/packages/erlang.scm (emacs-erlang): Change reference from add-source-to-load-path to expand-load-path * gnu/packages/protobuf.scm (emacs-protobuf-mode): Change reference from add-source-to-load-path to expand-load-path --- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/erlang.scm | 2 +- gnu/packages/protobuf.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eef33fd437..28b87d49dd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3310,7 +3310,7 @@ during idle time, while Emacs is doing nothing else.") ("pdf-tools-handle-upgrades" '())))) (add-after 'emacs-patch-variables 'emacs-expand-load-path (assoc-ref emacs:%standard-phases 'expand-load-path)) - (add-after 'emacs-add-source-to-load-path 'emacs-install + (add-after 'emacs-expand-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 7b5dc70b5d..d52d5c3983 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -232,7 +232,7 @@ built-in support for concurrency, distribution and fault tolerance.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'change-working-directory + (add-before 'expand-load-path 'change-working-directory (lambda _ (chdir "lib/tools/emacs") #t))))) (home-page "https://www.erlang.org/") (synopsis "Erlang major mode for Emacs") diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 857adf1703..9c6dcb51cc 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -311,7 +311,7 @@ structured data.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'change-working-directory + (add-before 'expand-load-path 'change-working-directory (lambda _ (chdir "editors") #t))))) (home-page "https://github.com/protocolbuffers/protobuf") (synopsis "Protocol buffers major mode for Emacs") -- 2.32.0 --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0002-guix-Make-modify-phases-error-when-adding-before-aft.patch Content-Transfer-Encoding: quoted-printable From b272a65b12175a3d0354f18e19247f9ed72f5f8e Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Wed, 23 Jun 2021 15:59:37 +1000 Subject: [PATCH 2/2] guix: Make modify-phases error when adding before/afte= r a missing phase * guix/build/utils.scm (alist-cons-before, alist-cons-after): Cause a match= failure if the reference is not found, rather than appending to the alist. * tests/build-utils.scm: Update tests to match. --- guix/build/utils.scm | 15 +++++++++------ tests/build-utils.scm | 12 ++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 419c10195b..6e052a7ea1 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2015, 2018 Mark H Weaver ;;; Copyright =C2=A9 2018 Arun Isaac ;;; Copyright =C2=A9 2018, 2019 Ricardo Wurmus +;;; Copyright =C2=A9 2021 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -571,18 +572,22 @@ effects, such as displaying warnings or error message= s." (define* (alist-cons-before reference key value alist #:optional (key=3D? equal?)) "Insert the KEY/VALUE pair before the first occurrence of a pair whose k= ey -is REFERENCE in ALIST. Use KEY=3D? to compare keys." +is REFERENCE in ALIST. Use KEY=3D? to compare keys. An error is raised w= hen no +such pair exists." (let-values (((before after) (break (match-lambda ((k . _) (key=3D? k reference))) alist))) - (append before (alist-cons key value after)))) + (match after + ((reference after ...) + (append before (alist-cons key value (cons reference after))))))) =20 (define* (alist-cons-after reference key value alist #:optional (key=3D? equal?)) "Insert the KEY/VALUE pair after the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=3D? to compare keys." +is REFERENCE in ALIST. Use KEY=3D? to compare keys. An error is raised w= hen +no such pair exists." (let-values (((before after) (break (match-lambda ((k . _) @@ -590,9 +595,7 @@ is REFERENCE in ALIST. Use KEY=3D? to compare keys." alist))) (match after ((reference after ...) - (append before (cons* reference `(,key . ,value) after))) - (() - (append before `((,key . ,value))))))) + (append before (cons* reference `(,key . ,value) after)))))) =20 (define* (alist-replace key value alist #:optional (key=3D? equal?)) "Replace the first pair in ALIST whose car is KEY with the KEY/VALUE pai= r. diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 654b480ed9..c694b479b3 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -38,17 +38,17 @@ '((a . 1) (x . 42) (b . 2) (c . 3)) (alist-cons-before 'b 'x 42 '((a . 1) (b . 2) (c . 3)))) =20 -(test-equal "alist-cons-before, reference not found" - '((a . 1) (b . 2) (c . 3) (x . 42)) - (alist-cons-before 'z 'x 42 '((a . 1) (b . 2) (c . 3)))) +(test-assert "alist-cons-before, reference not found" + (not (false-if-exception + (alist-cons-before 'z 'x 42 '((a . 1) (b . 2) (c . 3)))))) =20 (test-equal "alist-cons-after" '((a . 1) (b . 2) (x . 42) (c . 3)) (alist-cons-after 'b 'x 42 '((a . 1) (b . 2) (c . 3)))) =20 -(test-equal "alist-cons-after, reference not found" - '((a . 1) (b . 2) (c . 3) (x . 42)) - (alist-cons-after 'z 'x 42 '((a . 1) (b . 2) (c . 3)))) +(test-assert "alist-cons-after, reference not found" + (not (false-if-exception + (alist-cons-after 'z 'x 42 '((a . 1) (b . 2) (c . 3)))))) =20 (test-equal "alist-replace" '((a . 1) (b . 77) (c . 3)) --=20 2.32.0 --=-=-=--