From patchwork Mon Apr 29 20:43:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 26734 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E920127BBEA; Mon, 29 Apr 2024 21:44:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AFCB827BBE2 for ; Mon, 29 Apr 2024 21:44:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1Xqj-0007IF-J2; Mon, 29 Apr 2024 16:43:45 -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 1s1Xqg-0007Hs-Fw for guix-patches@gnu.org; Mon, 29 Apr 2024 16:43:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1Xqf-0003XG-OE for guix-patches@gnu.org; Mon, 29 Apr 2024 16:43:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1Xqz-0002vy-Ij for guix-patches@gnu.org; Mon, 29 Apr 2024 16:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Apr 2024 20:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70632 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin Received: via spool by 70632-submit@debbugs.gnu.org id=B70632.171442340511259 (code B ref 70632); Mon, 29 Apr 2024 20:44:01 +0000 Received: (at 70632) by debbugs.gnu.org; 29 Apr 2024 20:43:25 +0000 Received: from localhost ([127.0.0.1]:58778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1XqO-0002vX-J8 for submit@debbugs.gnu.org; Mon, 29 Apr 2024 16:43:24 -0400 Received: from mail-dm6nam10olkn2095.outbound.protection.outlook.com ([40.92.41.95]:20833 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1XqM-0002vQ-7Y for 70632@debbugs.gnu.org; Mon, 29 Apr 2024 16:43:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FxVGgf/F5VuT1cwjBc+4rU5DOo3PpDkpB75e9MCwKEvyOMK7a2KXntifXKvCUYVgyc74VEuaruwAeuHgXr8N+F+wm6uG6JHIIw8F6q3oa3/APkZezVUFJY2hZXjKrUS6GtQUr9Hdr1fh6CQoo6yxbPZuuv6U/0+A9HPRQ1h0FrH7Pn/milWhEXk2ujXsyeqTw1cwwUOCml7q/AaqNBDvagVF5K4V6qHfWI1e56efDbYVy3PDvd8i7fw9t/B5+5eYei5tUKnoTYy3DNz5OlpJgbOCft1ukpTQlEcQimtOt2hRrjGgPnws9FhJTxt57j5/3kPQZv+8glDqTGnGUtvgKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9lZBzaKcgLLYehGQ+cR9v7NEgDcrZ7t4ulSzjeqtWvY=; b=HSmsSncst4crAO/RBZgtk9VTPtwfsi3Hn30GO2bBtA4b2NxVIqWtKtuHhddLFeho2bMCUsUygemX1JTN5FkRS8kKfhZjgaXKucr2RNRAGNtXGbsgXpzL+gSX7ezofdOZNZ6oVkKgoWwOF2sYeNyJ0y/ONYLuR3NiHhOoUXB/fJM9ArkkLIaQu2dXVcNC2Wr5htpEkxgvQwXVoVJzuZb5PTaGo5njGVs8D/j3m2ELnNVxFO+sLrCLnNXYM2a1vR35/aLEEMS+Pkj3Q5BvGOB3nYZqhzfveVyI+baDZHXdkBgHNZj3FxjaP9BIMdeAIRq99wmFHaKADo/1y47JwmgEpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9lZBzaKcgLLYehGQ+cR9v7NEgDcrZ7t4ulSzjeqtWvY=; b=UcD4yXnrTMhe396OLqG3cunFrlYtF1nGyWZFSDzpKQgv9Ybb1zAJmtk3NonswVPlw9iPZvfKajd4RLql1UOp3sGvgAWvp92J/fZnGSanrEE65HPElWKPAWKYCnM9WDba3gpT+WQvO2nD8sjxhPuB6KSH/XeX3c7imtyrOC+GwFB0UBf04jHGxcIIm4d63QHpFSRYyHcB5L2bEtvdBFpxZ4/BPI+Tk2g9CO0C9YM1DX8b4B7sbHblEI5joJYc5BkLbqChREgNq+OmORQfQReqPRCe/HRhcTEnFwsZk568CmTxrmi7LNqKem70723QxWUjvY/l/GacpE4XBMIdlhw14A== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH0PR84MB1812.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:163::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.36; Mon, 29 Apr 2024 20:42:54 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 20:42:54 +0000 From: Morgan Smith In-Reply-To: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 29 Apr 2024 20:44:52 +0200") References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> X-Hashcash: 1:20:240429:andrew@trop.in::r4naJ33dpjV6SWXt:ze6 X-Hashcash: 1:20:240429:70632@debbugs.gnu.org::eumsX4msJ+Cx8zHn:1F5L X-Hashcash: 1:20:240429:liliana.prikler@gmail.com::T9IDNNY7NORCsSJA:0odD X-Hashcash: 1:20:240429:cox.katherine.e+guix@gmail.com::wuH6PGKhqMioa0I4:3eSL Date: Mon, 29 Apr 2024 16:43:06 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) X-TMN: [JpQr1cp056XgTIo19MnNH34Gy6MKuh/X] X-ClientProxiedBy: YT4PR01CA0371.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fd::20) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <87sez3zyqt.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH0PR84MB1812:EE_ X-MS-Office365-Filtering-Correlation-Id: ef9f4b19-4cc1-49ff-9b61-08dc688cf1f1 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|6092099003|440099019|3412199016; X-Microsoft-Antispam-Message-Info: 7y+uTeW7nRAFU7MT3PEau4CSUYCDWbCKC9PUjFURGAb7+e7AConMyOHkYiXwYOsLp/vsSwyXmxDh38+2KUQzGSLiTZ58IBYVfvYGtSk2MSzVfwpN8loINOiUSNQT5aGQ71l7Rqh19q8OYxSR3nyUDs+cgd1FH/HJ+aUPWnIhznm5uZ0Jj68wg0ioRBTOHAXYOlG9QF9HozQjbdUueN10tW5ChJme4P4Z1RI7Db98mXyPFF6NQjEEn9Kyb3wK2ox8ZIoKKd++Xr4A5DQrHSk5V3znbMs2+b2s8jJh/TzG9UBmoGG4xSpsIR0TzecQHMTG2UWzgc8EqEaAJ8owEAkiYilcYK82TA+ZEV9eGEqiXdxk4OcnwJn7zwxxUu6JSXvdaSqK45EcRwgkTOqkNqazLoga0TzjuYSQFG+7UNB3q9FgUzE4F+Jqm56wJUvcyuivfoZaF54HUOgsf6dauPi2+7dyGLtV60tTGMrQEfJmdSGcaqeoKf1JFx4v0QPk2gvmSxrT/FowlVQEHktrBd/TjTftiGueiKjxaCOjP5zqK95xPEYz6xrbSi3akRmHj6esEl0qAb4No0QO222bwfAUyZyD/sgmQK1QThzZO5kqy2fEB+bD/F/83v1dqOfViETJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bRbAoxTpgA3Fv+VzL7Ho1fnV7HXriPySWk7zHovMQ2I88EUBBExOYidI8Cj+p0ROulVzMexd+bJtLmunx1I+i3AlaD7mu4Yy0cBs1PNh5ukRe4tUjnEAq8VQCV8Aq8C5+jq2ZPtkftKUcaJ+1MnAsu0qAnO4GLPf9O0Fi5IWQ6AqbA5jKJJv3Usqw8x0pGvaWGbKlJp5Fyzz98G80n7iLWWbiiglpFBB/NlmZpUQHTDhIda0Ssyhvf6q2BcVOjKkA+9ze+KGJkt99plqaEO+C5boXtRdEQoZtYlsBbZCU2Cn1HF+HkRLBVOf66TlELjlbKf1BU537LAoi/xhgZ2tY/Dz4KVsiActLPumCbzI0B3lAorT3Xvp8L9tX5Dda6DsGGhGJHlb8mS9pwDmgi0T+29Gf+RraE2VfNmcwJJTzKkAZqYVW5K7PGmZrlUvOfe51tEdNIELcCdo5vmx7SbMj+gqReyayTTgQbfbOrDF1l0sjSqwWxonPxXt9TL/VUirSQDV2yiu3/HjD1NCq4d28OV3CeRW3Or0WhezU1aSlOvb8017tyMiOUA9OPVZuc2fkwk/R1fhJocJiGZN57Usz1k2DS8BxvL2Qjl6X4zo/p5cFluD4cVDTTgnSP2IjB7faFa0r4aVwPjbzozCcJ5a3VspIANPn5WWJPmLtxiSz2cdmmjj32B11AiGH8KAoCCJAIL8o5DGpBCrnDSLTUa2AHWwiPMzLRg6EBMevqQN3+NtN6ZwdUe2x4R8PnFXpHvg8yeZJtFVUTbb+t71NXdjnkN75ElboVnkq5EYR7sYiHpkhqeMZdJPtFpWIlu8RaalpWThExXPiGtpZrphdXytRBIwHCT1b+vPnzsrXLBVGmF4ObSLqXylUP0hGWPW9bJl7xOYvEIiX+SkSRx1kkB5SjbXcrdA8pYKgGFSL7RzdSBOqLqO6QEHn2FIUnvT6Z+oPj73jAcY7YCsK0CZ79ft0TS2htKxk8AzHrqaLBYdBTb6fdqcgfGb2fd3kivcx95eLnljmCabkG1sh4eIAxZCJ1z6hBNlcQRSztF9stmISHO2Fh0FhPuTvtIQmYqUCJo1ceqKCMrIZEgS/LzD9Nyrp4ftTcjvc3a9PGqsx4wDMjyxLDTzMZrCxidfFJaVAWWHRJzMKyphXT6I2ZMrfYX1ZO5kTx8cqw+UvNe1pLA+JjX0NoskKtMH6SKF19kDP6Uh0NKVwNyzVq/d0CPPjcvlkGyDcEqV6C/0NTbZrBmrEvkbDx0wRPdoZzRf5iVZxCx7 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef9f4b19-4cc1-49ff-9b61-08dc688cf1f1 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 20:42:54.5959 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR84MB1812 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Liliana Marie Prikler writes: > Hi, > > the change itself LGTM, but I think it should be accompanied by a > change to Emacs 30 and also we should really try to version it because > it rebuilds Emacs as a whole. The emacs-team branch hasn't been used > for a while and I think there's nothing big there; and neither is there > a need to exercise it if we just add another file and replace the > phase. > > Cheers I think some people might want to build newer Emacs's before the 30 release. Like how people wanted the pgtk and tree-sitter features early. People might want to try the new GC that's being developed. I'm not a fan of adding another file so I came up with this solution. See attached patch. If we believe that a core-updates merge will occur before Emacs 30 then I would like to see my original patch applied there. Thanks, Morgan From 0440fff5e554d442a113579fbc1330c05da98f6a Mon Sep 17 00:00:00 2001 Message-ID: <0440fff5e554d442a113579fbc1330c05da98f6a.1714423314.git.Morgan.J.Smith@outlook.com> From: Morgan Smith Date: Mon, 29 Apr 2024 15:27:59 -0400 Subject: [PATCH] gnu: emacs-next-minimal: Update to 30.0.50-3.ccb49ac. * gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.50-3.ccb49ac. (emacs->emacs-next): Adjust 'validate-comp-integrity phase for newer Emacs. Change-Id: Ib191d6044a4a3b56931f893c71dc998fc748245e --- gnu/packages/emacs.scm | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 411bea3ab6..022aac416f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -553,8 +553,8 @@ (define-public emacs-wide-int #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42") - (revision "2")) + (let ((commit "ccb49acd2afb8cec9cec1afba16e16420b9f9261") + (revision "3")) (package (inherit emacs-minimal) (name "emacs-next-minimal") @@ -567,7 +567,7 @@ (define-public emacs-next-minimal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk")) + (base32 "1hxwaqjm596yykq42wl28jicd0b8rqcabyb5xp958sirr3yi884b")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -585,7 +585,33 @@ (define* (emacs->emacs-next emacs #:optional name (string-drop (package-name emacs) (string-length "emacs")))))) (version version) - (source source))) + (source source) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'validate-comp-integrity + (lambda* (#:key outputs #:allow-other-keys) + #$(cond + ((%current-target-system) + #~(display "Cannot validate native-comp on cross builds.\n")) + ((member (%current-system) '("armhf-linux" "i686-linux")) + #~(display "Integrity test is broken on armhf.\n")) + (else + #~(begin + (copy-file #$(local-file + (search-auxiliary-file "emacs/comp-integrity.el")) + "comp-integrity.el") + (substitute* "comp-integrity.el" + (("\"native-compiled\"") "\"subr-native-elisp\"") + (("\"byte-compiled\"") "\"byte-code-function\"") + (("\"built-in\"") "\"primitive-function\"")) + (invoke + (string-append (assoc-ref outputs "out") "/bin/emacs") + "--batch" + "--load" + "comp-integrity.el" + "-f" "ert-run-tests-batch-and-exit")))))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) -- 2.41.0