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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 23 03:26:06 2021 Received: (at 49181) by debbugs.gnu.org; 23 Jun 2021 07:26:07 +0000 Received: from localhost ([127.0.0.1]:40318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvxGw-0002um-OQ for submit@debbugs.gnu.org; Wed, 23 Jun 2021 03:26:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:20205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvxGu-0002ua-3S for 49181@debbugs.gnu.org; Wed, 23 Jun 2021 03:26:05 -0400 Received: from localhost.localdomain (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4G8vvD4y4Jz3xMj; Wed, 23 Jun 2021 09:25:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624433160; bh=Z+jUXmN/78MzRqX2bhZziIlSpE40azdAO9+x/JVnxbM=; h=From:To:Cc:Subject:Date; b=RXX3BpIfUcm/3N94DcggcpP5RG+jFClElbV1H3V5yfzkMBkGMPElCiSYeOey5JWCu gZmRFSQHnP4Fznb802EOqLM2E6gl7jnOwddU3DeGyaK2VHNbuTreBmGvVJMaG/YL0y sz1jUihNONfXywJ1/PBludhQ3COVaIdM1djvg4u4= From: Leo Prikler To: 49181@debbugs.gnu.org Subject: [PATCH 0/1] modify-phases: error when encountering missing phase (was: Fix missing phases in Emacs builds) Date: Wed, 23 Jun 2021 09:25:09 +0200 Message-Id: <20210623072509.7165-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49181 Cc: carlo@zancanaro.id.au 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, I've signed off your first patch and pushed it to master. The second patch looks useful, but I'd like others to state their opinion as well. I'm resending it through git send-email, so that everyone can use their preferred tooling for fetching stuff from the mailing list. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 23 03:26:13 2021 Received: (at 49181) by debbugs.gnu.org; 23 Jun 2021 07:26:13 +0000 Received: from localhost ([127.0.0.1]:40320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvxGz-0002v1-Ul for submit@debbugs.gnu.org; Wed, 23 Jun 2021 03:26:13 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:41846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvxGu-0002ud-US for 49181@debbugs.gnu.org; Wed, 23 Jun 2021 03:26:07 -0400 Received: from localhost.localdomain (62-116-34-49.adsl.highway.telekom.at [62.116.34.49]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4G8vvG415Jz3wGN; Wed, 23 Jun 2021 09:26:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1624433162; bh=HgxJ/Z3/n9DQG5QYrUJB3O8c1qvhUZeMxcMdxLC9BZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ff47mQ2GcZivtSNRPzmz8V8hYhNRf1P7B/7XgFBB3BNjhsguIHSucVCOC4sbXuklx 4LArIIjMOS2RyNMqkeauUpwZpOxlQYb4mHrAUXqfOat/47MPJBFDUdIBog9nWo4za+ Tq8y7Ywd4Pm9j9H61MC5wR5yi+e1XwDVtE7tInFc= From: Leo Prikler To: 49181@debbugs.gnu.org Subject: [PATCH 1/1] guix: Make modify-phases error when adding before/after a missing phase Date: Wed, 23 Jun 2021 09:25:10 +0200 Message-Id: <20210623072509.7165-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210623072509.7165-1-leo.prikler@student.tugraz.at> References: <20210623072509.7165-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49181 Cc: carlo@zancanaro.id.au 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 (---) From: Carlo Zancanaro * 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 © 2015, 2018 Mark H Weaver ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2021 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -571,18 +572,22 @@ effects, such as displaying warnings or error messages." (define* (alist-cons-before reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair before the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=? to compare keys." +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when no +such pair exists." (let-values (((before after) (break (match-lambda ((k . _) (key=? k reference))) alist))) - (append before (alist-cons key value after)))) + (match after + ((reference after ...) + (append before (alist-cons key value (cons reference after))))))) (define* (alist-cons-after reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair after the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=? to compare keys." +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when +no such pair exists." (let-values (((before after) (break (match-lambda ((k . _) @@ -590,9 +595,7 @@ is REFERENCE in ALIST. Use KEY=? 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)))))) (define* (alist-replace key value alist #:optional (key=? equal?)) "Replace the first pair in ALIST whose car is KEY with the KEY/VALUE pair. 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)))) -(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)))))) (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)))) -(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)))))) (test-equal "alist-replace" '((a . 1) (b . 77) (c . 3)) -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 23 17:32:14 2021 Received: (at 49181) by debbugs.gnu.org; 23 Jul 2021 21:32:14 +0000 Received: from localhost ([127.0.0.1]:44782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72mE-0002tG-Hj for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:32:14 -0400 Received: from out2.migadu.com ([188.165.223.204]:34206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72mC-0002t6-7o for 49181@debbugs.gnu.org; Fri, 23 Jul 2021 17:32:13 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1627075930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RhJVOP6prLdgFbA7e3eQkBJ6mXEXMFwb+kkZI+kFjrw=; b=W3DF5a2YMuTCvNSSqEc3s0d6Dx7WQcAe/N6ZdAsJiBLxrm+CaaXE0foWhGJ/IXcLsSAwc9 /X2A3wMSWZBbX5cuMEbEpnm2q9jq+7/JZshxlPACSXaXOYSuA4+Tog3uMk39T9vWip0XCk g0XncBvgms5YmVxeJKQTBzlo5oBYs9A= From: Sarah Morgensen To: Leo Prikler Subject: Re: bug#49181: Fix missing phases in Emacs builds References: <20210623072509.7165-1-leo.prikler@student.tugraz.at> <20210623072509.7165-2-leo.prikler@student.tugraz.at> Date: Fri, 23 Jul 2021 14:32:08 -0700 In-Reply-To: <20210623072509.7165-2-leo.prikler@student.tugraz.at> (Leo Prikler's message of "Wed, 23 Jun 2021 09:25:10 +0200") Message-ID: <867dhgra1z.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49181 Cc: 49181@debbugs.gnu.org, carlo@zancanaro.id.au 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! I'm glad to see this. This behavior has caught me up a number of times recently. Leo Prikler writes: [...] @@ -571,18 +572,22 @@ effects, such as displaying warnings or error messages." > (define* (alist-cons-before reference key value alist > #:optional (key=? equal?)) > "Insert the KEY/VALUE pair before the first occurrence of a pair whose key > -is REFERENCE in ALIST. Use KEY=? to compare keys." > +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when no > +such pair exists." > (let-values (((before after) > (break (match-lambda > ((k . _) > (key=? k reference))) > alist))) > - (append before (alist-cons key value after)))) > + (match after > + ((reference after ...) > + (append before (alist-cons key value (cons reference after))))))) This can probably just be (untested): ((reference after* ...) (append before (alist-cons key value after)))))) Or if we want to avoid extraneous bindings completely (also untested): ((_ _ ...) (append before (alist-cons key value after)))))) > > (define* (alist-cons-after reference key value alist > #:optional (key=? equal?)) > "Insert the KEY/VALUE pair after the first occurrence of a pair whose key > -is REFERENCE in ALIST. Use KEY=? to compare keys." > +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when > +no such pair exists." > (let-values (((before after) > (break (match-lambda > ((k . _) > @@ -590,9 +595,7 @@ is REFERENCE in ALIST. Use KEY=? 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)))))) > > (define* (alist-replace key value alist #:optional (key=? equal?)) > "Replace the first pair in ALIST whose car is KEY with the KEY/VALUE pair. Other than that it looks good to me. Pushing this should also close #32661. This should be a patch for core-updates, though, since it changes derivations for any package that (directly or indirectly) uses ALIST-CONS-BEFORE or ALIST-CONS-AFTER. -- Sarah From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 02 19:03:36 2021 Received: (at 49181) by debbugs.gnu.org; 2 Nov 2021 23:03:36 +0000 Received: from localhost ([127.0.0.1]:38293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mi2oa-0006Nr-4u for submit@debbugs.gnu.org; Tue, 02 Nov 2021 19:03:36 -0400 Received: from zancanaro.com.au ([45.76.117.151]:42022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mi2oV-0006Ne-1z for 49181@debbugs.gnu.org; Tue, 02 Nov 2021 19:03:34 -0400 Received: by zancanaro.com.au (Postfix, from userid 116) id 23A0B35DF0; Tue, 2 Nov 2021 23:03:29 +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 golem (n114-78-12-98.bla3.nsw.optusnet.com.au [114.78.12.98]) by zancanaro.com.au (Postfix) with ESMTPSA id 4C56135DEE; Tue, 2 Nov 2021 23:03:28 +0000 (UTC) References: <20210623072509.7165-1-leo.prikler@student.tugraz.at> <20210623072509.7165-2-leo.prikler@student.tugraz.at> User-agent: mu4e 1.6.6; emacs 27.2 From: Carlo Zancanaro To: 49181@debbugs.gnu.org Subject: Re: [PATCH 1/1] guix: Make modify-phases error when adding before/after a missing phase Date: Wed, 03 Nov 2021 09:58:52 +1100 In-reply-to: <20210623072509.7165-2-leo.prikler@student.tugraz.at> Message-ID: <87ilxa5fev.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49181 Cc: Leo Prikler 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 (-) This patch has been sitting around for a while, and I think it would be good to merge it. It still applies cleanly on top of master. What can I do to get this merged? Carlo On Wed, Jun 23 2021, Leo Prikler wrote: > From: Carlo Zancanaro > > * 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(-) > > ... From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 28 22:18:45 2023 Received: (at 49181) by debbugs.gnu.org; 29 Mar 2023 02:18:45 +0000 Received: from localhost ([127.0.0.1]:51060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phLOf-0006KO-Gc for submit@debbugs.gnu.org; Tue, 28 Mar 2023 22:18:45 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:37635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phLOd-0006KB-K2 for 49181@debbugs.gnu.org; Tue, 28 Mar 2023 22:18:44 -0400 Received: by mail-qt1-f170.google.com with SMTP id r5so13885773qtp.4 for <49181@debbugs.gnu.org>; Tue, 28 Mar 2023 19:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680056318; x=1682648318; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Nqu+6YDVYtXPbAvP9BI89Ii0JCVnzUw3Re4lLOfDzpc=; b=EiC3O/9CDKQHJ0s1m6/y7NN2eRyQHzaqSutW1Kx8tIfoKRGApdjRTVIewGgCQmtUvm 8t//Wt4X00ZY0u5oMbQuLaslgTQuazmWPERI5Op3Cnp3+0rMvyt/qeP8R/UGy/03SZnB 0hMm5pxEs9HRbw8gwHmdZsBpFKhBYeyEUyLR2lXlhzkne0F8pIhM/+HZmYSQUQEVmAtv NBDg10Ze/dGbna5yyCk8JMufTmuzDsIRj0TOdN96UIATPm+M5TFebNy+XJwjFK68db1i WZmCFxXkeXoP5oR0O6TXqqMhxi0WvAWikxv9lmYESY6LWUGEUqnM+npUNT02a89KNPlC fF6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680056318; x=1682648318; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Nqu+6YDVYtXPbAvP9BI89Ii0JCVnzUw3Re4lLOfDzpc=; b=iEIKs2BCxcBOqky8mBEe7a88TqxgHsuT8tKM8GFvIeScZaZLdsaoVljbFVdaSMfUsE Itvr3LWsNEoO8r7u1CvsR3bXVDL7FEP70PCNKQYvWtargyE22557JY8x4rZaE2vk1jKg FVHvuU62giAVeITJ4dD28z3V3kQeD80eQe0OYeIJ7a8XfA+B2PU2x/Bvj3X9QsSIWrfp Jd0aAAF2zxRCS/whIvf6y9nAH9yrgNR0E7HPJdcJd3zCgd+GrJDoxIQgPbT0tWEf1U1x pdPoK3MS+1uE6LtvT6ItZR1kq1FYnSjmV6v3ifDLEyqkC2IXbAwza/UF6rJfNrWl450x rRIQ== X-Gm-Message-State: AAQBX9fSZB8SJJGKmh5N6ofUMGWt68ERpn5SlyiMyEpuXm0ZCg+E9nVQ tdRBhrUc1B/gXhdxjUMRQYiIeeBePue3vg== X-Google-Smtp-Source: AKy350aCvJR83+k9h0WEO0CKlyPZGfoOFpiKiIUItbHgo7a3XK/kh+3dRWuQl3GIoLnAKaCIltD95g== X-Received: by 2002:ac8:7d0c:0:b0:3e4:e94a:5082 with SMTP id g12-20020ac87d0c000000b003e4e94a5082mr15331210qtb.5.1680056318134; Tue, 28 Mar 2023 19:18:38 -0700 (PDT) Received: from hurd (dsl-205-151-56-156.b2b2c.ca. [205.151.56.156]) by smtp.gmail.com with ESMTPSA id c23-20020a379a17000000b007436d0e9408sm13157963qke.127.2023.03.28.19.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 19:18:37 -0700 (PDT) From: Maxim Cournoyer To: Carlo Zancanaro Subject: Re: bug#49181: Fix missing phases in Emacs builds References: <20210623072509.7165-1-leo.prikler@student.tugraz.at> <20210623072509.7165-2-leo.prikler@student.tugraz.at> <87ilxa5fev.fsf@zancanaro.id.au> Date: Tue, 28 Mar 2023 22:18:36 -0400 In-Reply-To: <87ilxa5fev.fsf@zancanaro.id.au> (Carlo Zancanaro's message of "Wed, 03 Nov 2021 09:58:52 +1100") Message-ID: <87cz4s47wj.fsf_-_@gmail.com> 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.0 (/) X-Debbugs-Envelope-To: 49181 Cc: 49181@debbugs.gnu.org, Leo Prikler 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 Carlo, Carlo Zancanaro writes: > This patch has been sitting around for a while, and I think it would > be good to merge it. It still applies cleanly on top of master. > > What can I do to get this merged? Have you seen the good comments from Sarah up thread? Perhaps you could send a rebased v2 integrating them. And then ping us in #guix if it falls into the cracks again! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 09:05:36 2023 Received: (at 49181) by debbugs.gnu.org; 20 May 2023 13:05:36 +0000 Received: from localhost ([127.0.0.1]:58016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0MHA-0006Up-7C for submit@debbugs.gnu.org; Sat, 20 May 2023 09:05:36 -0400 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:49854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0MH5-0006UX-SY for 49181@debbugs.gnu.org; Sat, 20 May 2023 09:05:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=6s1ZJSIDMOZel0j MWwyHQjWy8WhNfzzHEyLzgMTviPw=; h=date:subject:cc:to:from; d=zancanaro.id.au; b=FS8nuJUSQ2ggr7hSg2dCjtYqJyeZ9PljL1lW5kPBwnh5gdtbG i8WKEvrJ8SMRVuAEAb0HklWsr0eQfY7Ry3tMZj3cMrosdAMRL64noS7abSzwxbUeymtx3u qhzDCZZtIGNQTdZkHiKE3JmbjHwX2OUrBh8mFxc6iBB7F0H8jSEo= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id b45418a1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 20 May 2023 13:05:16 +0000 (UTC) From: Carlo Zancanaro To: 49181@debbugs.gnu.org Subject: [PATCH core-updates v2] guix: Make modify-phases error when adding before/after a missing phase Date: Sat, 20 May 2023 23:05:06 +1000 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49181 Cc: Maxim Cournoyer 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 (-) * 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 2352a627e9..8e630ad586 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2023 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -729,18 +730,22 @@ (define (every* pred lst) (define* (alist-cons-before reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair before the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=? to compare keys." +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when no +such pair exists." (let-values (((before after) (break (match-lambda ((k . _) (key=? k reference))) alist))) - (append before (alist-cons key value after)))) + (match after + ((_ _ ...) + (append before (alist-cons key value after)))))) (define* (alist-cons-after reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair after the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=? to compare keys." +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when +no such pair exists." (let-values (((before after) (break (match-lambda ((k . _) @@ -748,9 +753,7 @@ (define* (alist-cons-after reference key value alist alist))) (match after ((reference after ...) - (append before (cons* reference `(,key . ,value) after))) - (() - (append before `((,key . ,value))))))) + (append before (cons* reference `(,key . ,value) after)))))) (define* (alist-replace key value alist #:optional (key=? equal?)) "Replace the first pair in ALIST whose car is KEY with the KEY/VALUE pair. diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 7f4f12ccc7..3babf5d544 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -41,17 +41,17 @@ (define-module (test build-utils) '((a . 1) (x . 42) (b . 2) (c . 3)) (alist-cons-before 'b 'x 42 '((a . 1) (b . 2) (c . 3)))) -(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)))))) (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)))) -(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)))))) (test-equal "alist-replace" '((a . 1) (b . 77) (c . 3)) base-commit: 24b6f94cf9b4ab97ef2eb70d05b2104a06776e62 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 20 09:19:40 2023 Received: (at 49181) by debbugs.gnu.org; 20 May 2023 13:19:40 +0000 Received: from localhost ([127.0.0.1]:58021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0MUl-0006p9-Oy for submit@debbugs.gnu.org; Sat, 20 May 2023 09:19:39 -0400 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:48442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0MUj-0006ou-MR for 49181@debbugs.gnu.org; Sat, 20 May 2023 09:19:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=Yy+r5SIdfSZ7YiK 69Y4gN2B9iRNbG3hE/qumo0eG3i8=; h=in-reply-to:date:subject:cc:to:from: references; d=zancanaro.id.au; b=FHRoIEW0q+IhdS5S8koZLrubaokro1syKHCiv ZQDLRE3ozgibTyX8Cbn1HAVtI5LFGw93TlWDZJpLYxjPjCyMfSMOYrovIJPZ7GfGjO9X3k kByN6wlQ6lqzVnvnN4Fi9CLnvgUutllDaebiVXCFZkbickJL9E+2CUUmYu79a+Bo= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 71ea6b22 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 20 May 2023 13:19:23 +0000 (UTC) References: <20210623072509.7165-1-leo.prikler@student.tugraz.at> <20210623072509.7165-2-leo.prikler@student.tugraz.at> <87ilxa5fev.fsf@zancanaro.id.au> <87cz4s47wj.fsf_-_@gmail.com> User-agent: mu4e 1.10.2; emacs 29.0.90 From: Carlo Zancanaro To: Maxim Cournoyer Subject: Re: bug#49181: Fix missing phases in Emacs builds Date: Sat, 20 May 2023 23:13:12 +1000 In-reply-to: <87cz4s47wj.fsf_-_@gmail.com> Message-ID: <875y8n2lb3.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49181 Cc: 49181@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 (-) Hi Maxim, On Tue, Mar 28 2023, Maxim Cournoyer wrote: > Have you seen the good comments from Sarah up thread? Perhaps > you could send a rebased v2 integrating them. I've sent an updated patch with the fix that Sarah mentioned. I also added "core updates" to the PATCH bit, because I imagine Sarah is right that this would trigger a bunch of rebuilds. I'm not sure that these changes warranted a two year wait on this patch, but I still think the patch is worth merging. Carlo From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 20:57:10 2023 Received: (at 49181) by debbugs.gnu.org; 10 Oct 2023 00:57:10 +0000 Received: from localhost ([127.0.0.1]:33672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq13e-00060h-7l for submit@debbugs.gnu.org; Mon, 09 Oct 2023 20:57:10 -0400 Received: from voltorb.zancanaro.id.au ([45.77.50.64]:38610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq13Z-000607-Me for 49181@debbugs.gnu.org; Mon, 09 Oct 2023 20:57:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=c9qfj6SwWfMJE6v mJMQIqI9DqUSSRu+ny02x2rEMcKQ=; h=in-reply-to:date:subject:cc:to:from: references; d=zancanaro.id.au; b=M2DNnUUeR0OjlTZtP4YrWFjR3DnHEW6wBlK8S tEl5+roZgXPUEL2yfM0NBvdRX9I87xSROxIGEXMtntAf9/SespBgngfH6l4w7TlFqy91FJ OQI+BhvnnUcxLJyWALiHXMeXKRfFhh7QLkWleQdIH1bG83qjUK8FLF6TVRAXi5RU= Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 2a76949d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 10 Oct 2023 00:56:18 +0000 (UTC) References: <87k0mlaxkn.fsf@zancanaro.id.au> User-agent: mu4e 1.10.7; emacs 29.1 From: Carlo Zancanaro To: 49181@debbugs.gnu.org Subject: Re: [bug#49181] [PATCH core-updates v2] guix: Make modify-phases error when adding before/after a missing phase Date: Tue, 10 Oct 2023 11:50:06 +1100 In-reply-to: Message-ID: <87o7h79tx7.fsf@zancanaro.id.au> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49181 Cc: Maxim Cournoyer 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 (-) Ping! Given the upcoming planned world rebuild, it would be nice to get this into core-updates. On Sat, May 20 2023, Carlo Zancanaro wrote: > * 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(-) > ... From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 09 23:38:02 2023 Received: (at 49181-done) by debbugs.gnu.org; 10 Oct 2023 03:38:03 +0000 Received: from localhost ([127.0.0.1]:33728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq3ZK-0001y8-Gk for submit@debbugs.gnu.org; Mon, 09 Oct 2023 23:38:02 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:54534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qq3ZG-0001xZ-Gq for 49181-done@debbugs.gnu.org; Mon, 09 Oct 2023 23:38:00 -0400 Received: by mail-qv1-xf33.google.com with SMTP id 6a1803df08f44-65af7d102b3so34046536d6.1 for <49181-done@debbugs.gnu.org>; Mon, 09 Oct 2023 20:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696909051; x=1697513851; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=553anyow8orugq/c8+NxUm9oqjbTfXsCVPQrRdyrwjc=; b=S+tWURjrQOULf6qnwGgQeLswLRToGtOMJecQDrXn6cfFvf38gCwO+Fe3s5lYprluPB Z61oA5GjQ0O5MAk6YB6oRxzlkpMYYiinhv88zkXio5wXNmTy6JHXjehCeyI+M4jiYPSt SJwXu0CYcttYL0e5eX2lhoRGVXMt2KUvysAg55Q/J1Wtfqhu4ixxfX1RQmbDM0O1ZWWk WPrLXyfpq72DsgsdciBW9w1O25+Ahq3W7uWRna5f1+ySqkIm+u7VS+QSGoiYL9t60m0W OTjLakoKq8R37W3mnql6Gz37iPJNganQ92/Y31QJYY3PLHMpEGcEXb5Ldhp2RgSaGPAr 0QSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696909051; x=1697513851; h=mime-version:user-agent: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=553anyow8orugq/c8+NxUm9oqjbTfXsCVPQrRdyrwjc=; b=sH8GqSmWZjMCtR6TISlF+7/8msAl6bo5uXVujOcrDLAE3nwCM3fLtqcwnTTJGD1g0p zSQG14HAUxcPS4qvq1CLknKXaIF5n8Xaf/+s+v4dtHONmWHKQ3s0dH5li9IyJV2F/PIK v6vlrYpSgRxDh5ITeWmteHlpcFY/t/vsG59+MPGskz3ey8dKJmbsT1eJ8T0/R8+f8wJu KtjSkLEJg5v4+02boA63qxSdbzQxua8uPG6HxQNfU4POowGmaV867RnQWZVBhMuqjvC6 Lz0bydP+YAmwdmMpa6xUEcsYidf9M9lhsjyl7iCt/dDX8V3h8zMhG6Rt1W/apWiHAtqs e6Gw== X-Gm-Message-State: AOJu0Yy6ZC8hRYPUmZvTT5lGq9C9zm1mC1lo1GrK7L+p6shETWwYBXJB qvbeAxQdxsR9/GLG7XZQQoH0jAQVdzc= X-Google-Smtp-Source: AGHT+IHQPyBq4N4FnLS2lj/OnqErAW6BcWDIjs1V8wMI7//ZB4Efta7K1GhQKdDlzuPR6sMy2euoHQ== X-Received: by 2002:a05:6214:451d:b0:65a:8b45:2660 with SMTP id oo29-20020a056214451d00b0065a8b452660mr18202959qvb.14.1696909051685; Mon, 09 Oct 2023 20:37:31 -0700 (PDT) Received: from hurd (dsl-10-149-16.b2b2c.ca. [72.10.149.16]) by smtp.gmail.com with ESMTPSA id i1-20020a0cf381000000b0064f43efc844sm4358470qvk.32.2023.10.09.20.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 20:37:31 -0700 (PDT) From: Maxim Cournoyer To: Carlo Zancanaro Subject: Re: bug#49181: [PATCH core-updates v2] guix: Make modify-phases error when adding before/after a missing phase In-Reply-To: (Carlo Zancanaro's message of "Sat, 20 May 2023 23:05:06 +1000") References: <87k0mlaxkn.fsf@zancanaro.id.au> Date: Mon, 09 Oct 2023 23:37:30 -0400 Message-ID: <87h6mz6tc5.fsf_-_@gmail.com> 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: 49181-done Cc: 49181-done@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 (-) Hi, Carlo Zancanaro writes: > * 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. Installed to core-updates! -- Thanks, Maxim From unknown Mon Jun 23 09:37:37 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 07 Nov 2023 12:24:11 +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