From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yGXVJJM1+2BVmQAAgWs5BA (envelope-from ) for ; Fri, 23 Jul 2021 23:33:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oM4vIJM1+2BILAAAbx9fmQ (envelope-from ) for ; Fri, 23 Jul 2021 21:33:07 +0000 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 C5CA4FFB1 for ; Fri, 23 Jul 2021 23:33:06 +0200 (CEST) Received: from localhost ([::1]:42500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m72n3-0000FR-SN for larch@yhetil.org; Fri, 23 Jul 2021 17:33:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m72n0-0000FJ-Ay for guix-patches@gnu.org; Fri, 23 Jul 2021 17:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m72n0-0005w8-2H for guix-patches@gnu.org; Fri, 23 Jul 2021 17:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m72mz-0002uE-RR for guix-patches@gnu.org; Fri, 23 Jul 2021 17:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49181] Fix missing phases in Emacs builds Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 21:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Leo Prikler Cc: 49181@debbugs.gnu.org, carlo@zancanaro.id.au Received: via spool by 49181-submit@debbugs.gnu.org id=B49181.162707593411118 (code B ref 49181); Fri, 23 Jul 2021 21:33:01 +0000 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 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-Auth-User: iskarian@mgsn.dev 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627075987; 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=RhJVOP6prLdgFbA7e3eQkBJ6mXEXMFwb+kkZI+kFjrw=; b=gBk/RA1obWBiUWbDRvQ1WZFUOLb+Nelq7eGIbh78aXQer1Sy8VMhNKUr8XibodT5YxXpCW ebBjlzsRzK9Vk76ELUgs1eJHQdCorTxB5+znI8/e7+WX3qdnC+zTQBDwesZIAYsmTytc+G BV11vfIrTYHPWGcZGaZB7cL+rc80hLwd8ag9RfCJExaVROPmM1e5KkJxWGheUvnXBn1KNs fMzhoQBNjUAVOpB93vY4IbC7aTmSa6V69gTMD/LRu7mgBdnHfkb0L8XYkhUxO/TbAflbnf qGOUDlmWMeqockO2GEJdT1+XgyPdfsHb2iz/6z80FSlc4OohBQy5AUZNfpK2qQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627075987; a=rsa-sha256; cv=none; b=cLGkdaKb1yb/q+CB1+KmV0hvnh0TQXMvzHEWDUfabmVeS+ZMfrAMDnlzUXVgLSgXB2Pce6 mi+mOSrFZcl3Gz/kkcYu8Sd4QZIk89NKb/vzkXSAF6BTV9a+7vLIAy2VCfLLaFqfR/Uim0 512lvTvrCrqOD450e1IIe57NzSvvJRKW+9WwXG2HUcrLjUhitFS0mMCB50Anf5HQsykYy0 0cSB/n+Qb9/Lp1B2/QBNzn0s8bbpGVV4ec5rZWdEGSEvlwYl/IVLGyv03RKBKtl7w36DzP YW71/obCg0EFzvVtAnC8kn3d3utyfUF/oGixxmEFdD+FnOyKQFcqxfA3JNyGtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=W3DF5a2Y; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=W3DF5a2Y; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C5CA4FFB1 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: qEFs+D4FdFY6 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