From unknown Thu Jun 19 14:21:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51258: emacs-next/git-master broken due to pdmp file naming changes Resent-From: Paxton Evans Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 18 Oct 2021 04:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51258@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163452959232635 (code B ref -1); Mon, 18 Oct 2021 04:00:04 +0000 Received: (at submit) by debbugs.gnu.org; 18 Oct 2021 03:59:52 +0000 Received: from localhost ([127.0.0.1]:45564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcJoW-0008UJ-2h for submit@debbugs.gnu.org; Sun, 17 Oct 2021 23:59:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:44144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcDaU-0006q3-5M for submit@debbugs.gnu.org; Sun, 17 Oct 2021 17:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcDaT-0006lb-Vf for bug-guix@gnu.org; Sun, 17 Oct 2021 17:20:57 -0400 Received: from mx1.riseup.net ([198.252.153.129]:51100) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcDaR-0008OG-MD for bug-guix@gnu.org; Sun, 17 Oct 2021 17:20:57 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4HXXx102kQzDqBC for ; Sun, 17 Oct 2021 14:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1634505653; bh=T6DzXuxEoglXcFhxj4taYYvw2niD3zda9jV/tEyJteo=; h=Date:From:To:Subject:From; b=tQyBLfHiZKcuR3s8yeGTXkZWm+LvujVKxrP38b4MmWBC0+JQfqf5YW4S56GEuDAUV bRvUgbE4LXR90FzsCr/7OSXWaVwmi6qQf3xbA9uAJ5HMJa9aZpjj1uV6KhCCnQOxLA ELrIFj5Gkkvk/c1wEGI1Uuh0npDZqQLBHZyxSNG4= X-Riseup-User-ID: C3F7CFFC4D784B69D7C51B90991EEFA5A472411DF9101B4DF61B4389C191A053 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4HXXx06GCnz5vNY for ; Sun, 17 Oct 2021 14:20:52 -0700 (PDT) MIME-Version: 1.0 Date: Sun, 17 Oct 2021 14:20:52 -0700 From: Paxton Evans Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=paxton@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-Mailman-Approved-At: Sun, 17 Oct 2021 23:59:51 -0400 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 (--) As of Emacs commit e81f1faca4382ed5c8f15fec84fb7c900a5468f9, building emacs-next with the git-master branch will cause some problems on Guix. The "emacs-next" build itself will work without any errors, but it will complain whenever you try run it: > emacs: could not load dump file > "/gnu/store/a5bx5v96snvgiv9r1b7i1im5ccn5mz54-emacs-next-git.master/libexec/emacs/29.0.50/x86_64-pc-linux-gnu/emacs-66e6890a5565f2bed1ee56075d21e0051d891a59200cdd092c0946403fb84ac2.pdmp": > not a dump file This will also cause new builds of packages that use emacs-next/git-master as an input to fail as well, with a version of the same error. Here's a (failed) build log for emacs-pdf-tools: > [top part snipped] > > make[1]: Leaving directory '/tmp/guix-build-emacs-pdf-tools-0.90-2.5f77dae.drv-0/source/server' > phase `install' succeeded after 0.3 seconds > starting phase `patch-shebangs' > phase `patch-shebangs' succeeded after 0.0 seconds > starting phase `strip' > stripping binaries in "/gnu/store/swfjir05k1bg22l50yawhibbv0y5qhr9-emacs-pdf-tools-0.90-2.5f77dae/bin" with "strip" and flags ("--strip-debug" "--enable-deterministic-archives") > phase `strip' succeeded after 0.0 seconds > starting phase `validate-runpath' > validating RUNPATH of 1 binaries in "/gnu/store/swfjir05k1bg22l50yawhibbv0y5qhr9-emacs-pdf-tools-0.90-2.5f77dae/bin"... > phase `validate-runpath' succeeded after 0.0 seconds > starting phase `validate-documentation-location' > phase `validate-documentation-location' succeeded after 0.0 seconds > starting phase `delete-info-dir-file' > phase `delete-info-dir-file' succeeded after 0.0 seconds > starting phase `patch-dot-desktop-files' > phase `patch-dot-desktop-files' succeeded after 0.0 seconds > starting phase `install-license-files' > installing 0 license files from '.' > phase `install-license-files' succeeded after 0.0 seconds > starting phase `reset-gzip-timestamps' > phase `reset-gzip-timestamps' succeeded after 0.0 seconds > starting phase `compress-documentation' > phase `compress-documentation' succeeded after 0.0 seconds > starting phase `enter-lisp-dir' > phase `enter-lisp-dir' succeeded after 0.0 seconds > starting phase `emacs-patch-variables' > emacs: could not load dump file > "/gnu/store/rv72rvqa3vh2vw7jpkm3d9ww0xb4ibxv-emacs-next-git.master/libexec/emacs/29.0.50/x86_64-pc-linux-gnu/emacs-4588128eef9937d195927b0cccee280697619db43041dd08b620788b8dd59b77.pdmp": > not a dump file I think this is because of some recent changes made to the naming of the Emacs pdmp file in the master branch. Previously, it just made a file called "emacs.pdmp" but now it appends the version or commit hash, i.e. "emacs-4588128eef9937d195927b0cccee280697619db43041dd08b620788b8dd59b77.pdmp". This new naming scheme started with Emacs commit e81f1faca4382ed5c8f15fec84fb7c900a5468f9. This might be confusing Guix's Emacs package recipe, which has a regexp that simply looks for "emacs.pdmp" when it does some cleanup after building Emacs. guix/gnu/packages/emacs.scm:182 and following: > (lambda* (#:key outputs target #:allow-other-keys) > (let* ((libexec (string-append (assoc-ref outputs "out") > "/libexec")) > ;; each of these find-files should return one file > (pdmp (find-files libexec "^emacs\\.pdmp$")) > (pdmp-real (find-files libexec > "^\\.emacs\\.pdmp-real$"))) So I think that regexp might need to be changed a little to accommodate those recent Emacs changes. That's as far as I'm able to get with it, though, as I'm not very good at Guile or regexps. -paxton From unknown Thu Jun 19 14:21:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH] gnu: emacs: Handle pdump filenames that contain a fingerprint References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 18 Oct 2021 23:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51258@debbugs.gnu.org, paxton@riseup.net Cc: Morgan Smith Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163460142624209 (code B ref 51258); Mon, 18 Oct 2021 23:58:01 +0000 Received: (at 51258) by debbugs.gnu.org; 18 Oct 2021 23:57:06 +0000 Received: from localhost ([127.0.0.1]:48873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mccV8-0006IP-D8 for submit@debbugs.gnu.org; Mon, 18 Oct 2021 19:57:06 -0400 Received: from mail-dm6nam10olkn2068.outbound.protection.outlook.com ([40.92.41.68]:65281 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mccV4-0006Hs-PV for 51258@debbugs.gnu.org; Mon, 18 Oct 2021 19:57:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UyMi6nPRhpnXHpEW6o/mKy3MpiWR+v26VbJ9p/M6MVOd7vqJJoM7Pp0GwyNr0ZZYlQEfVGd34oG4WbV+v6tPYhArOaRx10uaOMgB1LM+ddEMWn4bceqUFBlu63gHyEddBny3Gnt3HxebEdmNebnh4jq54FD2/Bh0kzxcyQ2zPPtQIhD+3DCdQZgywv5LpOKT7dWhdlUSXjHyxWtAdR6pBESeNcNkbExntkBZKRQNKWCTwjIJJjcsXC+e+aSqbymXbuSDKs2y+Vwej8N9aSWpeytYfuxg5Zx5O8XwPFbhDaVFhrAzktHkvanGOIDE18Yc77UbWU5zrfeJH/gZL0Aehw== 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=PyM+hxvVYURDmOFyuGu598UQ5WXqmZ4634cg607Fl1Q=; b=iiHngxIVMO/vkzDGlboR/ZE6Dgr4yuBqX/7pUuZDe5Qfht55HPtblxb9ucP66IcA3cG+rzC5wWFxK4y9KsrlOogILcyksIZjgUMaY93hoNW08ZX/J4nrvMVFGZdsfwLyxNeMqSEd2L7WgaJBfTbR8kd/hhrdkOuQQ4BCxryvYiWixEnixo05SpY/Mdei85qiIft2Xu+6livbMe9g+eN8LRNsKDBiDfykayZabzpWPrsWXWNfcWQoZ7POPBhvB0vruYTJlkdoK+RwFE1g6+WZb3Kt4bA0lhX5ByDku9h2hi7CxvHn0zYsv1uFwu2HNVMQfPqVJi8RevYnid5R++fhbw== 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=PyM+hxvVYURDmOFyuGu598UQ5WXqmZ4634cg607Fl1Q=; b=WS7ZbtuffC7X3X/VN+M7jvGqrBdweNsRACLisEaras3rM1KE429Oxp24oSoAu27H0ZYVi0o57+xXg8jPtTp0fqbMw9zlDa1eqtAlc4+bH8IQj3TQK6RawEW17MNSoWCj8zCGWvuIQxi95WsOJkmz01V5HbMgXBOWRnF73xbHwuZsfinADEv2VB/HCcv8KtpYeCyvCaUzHa11rlrEfwoTLAyXxJC3IY0AAsNCwi9uGBpqa5GZxRH8z+yv2/oCCjO0QrX9aVTMOkOSp+f56PNlHKfxp4ppXivIFfKc47d0hiUQi21TOdCtN0mSncm1tyh1yIvFUZMo1OKAK7ecpwGkxg== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB5605.namprd05.prod.outlook.com (2603:10b6:a03:19::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.13; Mon, 18 Oct 2021 23:56:55 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154%6]) with mapi id 15.20.4628.013; Mon, 18 Oct 2021 23:56:55 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 18 Oct 2021 19:50:21 -0400 Message-ID: X-Mailer: git-send-email 2.33.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [dzNiotnBAhvxODMHktpf3j0eI5hh0V0B] X-ClientProxiedBy: YQBPR0101CA0074.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::7) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211018235020.2571-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from workpad.hitronhub.home (170.52.80.188) by YQBPR0101CA0074.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend Transport; Mon, 18 Oct 2021 23:56:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 698057ab-1c8e-4189-2afa-08d99292f64d X-MS-Exchange-SLBlob-MailProps: qY7UPrLqMbalyWoI5u7OsJQuz3l+pwQCYLwsTLkCrLcOq1YbkD/tboYf8KFfL40bpNq9jObRKO6+wLDdEnGYl1xAqrWDzkd+kVQ5jbV5r3HTokWxB+rsPsNzIk26KMvoEgHGzeOwL5FkrFKGF2o5HlADLDOp+98hye+YOPUzuNx/BUQCv0YxW3v8ZryooMOr3uezzY5t45y7ue6QOuu1oJDlI1FBc+rPaU4MpXOtYzv3z8qAJ/EdqHhTDq44Pm+hjkGsBzvZnOA1t15ef1ZfKVVXHpU9gBmTraxfkoJcEAbbfdEPl+RANJmP5gcGkv6wNAQRE213B351SyQpNEC7V+9UPSQplVR8Vxj1ze+IYCPPZiwQUen1+B9yONU1Ip2cAcQQGrFnD3o4fDAXLbp3Qe8EduA7/M4sN3SVfTDCV6hK599aOohw9p7eXf6ckUk+P2LzWXQl/meaXBc+e13nJ5qQhKfrzIr0oCLOP4dX3hmCYWfTGKWER3yi+olOaXxlJ6ZOzh6Qo3CE5j10QpIf56/3tsyZ2Io9KJkEOl3MCia8eJUDquC3dpWhAyWcqY+L1chU0CAMbZVEVrsPIi0oEaI/sQIKKTnCiB/QrVt7elV1joovWkW+vxwR2ES/7B6SQGmRuQWe+5HpCEe2hURumeIw2aeQ5x/6fkxpgjDbtkGZT5W94rYe4zAWDdZfwT77+mGEHk0uuX0YEmzS4zInow== X-MS-TrafficTypeDiagnostic: BYAPR05MB5605: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vPwRZbRPDN5qiDdjxy8nFV8M0xMYmeuR5bbI3RkDIEc5vy5ptPwpG5RGGqxZvkEt5lvssy41sxCOgTbc9lRkqwqeLvhPufUYlutOxx/MNGP+/vbFVa5aEpvVXeJVZovho+ehfrgCdCzL/CCmftHbzVxDITxdBN5kFwhPwmiTQbSIKzX0kgcPmJ1mi0xq4IY6zTKDJa4FZfL1wVPTJV2cTIKhiqGXNgUt2QWQdtcqVgEyysd4uBUbdV3PjjskRfcU5kiVHegg0se/O0s2QG56xikPBBw2Obyk0GDQBHpY61OtVmJ/NsPaMMV1etqUc3ooevKFiW0i3ipHUTs4anok0ga0Gn3iB/JhVZzRewOHhg4Zv2267hr4v7kJzyelhQfRTeWF6cby/o87fZz74d+8szcjcc2mP6Ugxlf213VyQ+WP7O2IpXcWVfqtN2Mu3VYkNndgWhtepEnw6WGBIedykVtdfwaUaHK96dvIg7x78izWRlYZv5MMA1SeRQQVoex0aDI0c0CyIJLeH+fZUIdS7gnMk+jbysiAoZMI1FIAojw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AiVPMyLFNNXf24RzrBXysVCzap4XyHFFW+BWCp5U1g90HiwMfacJ9XyAjdAEf9+Ww7PXAI26l2uot14odjGhPuql9f+tOeTqr8VBvaSj0mXd5EoZNtWiVA/Z/jVZZPv9jaS65pVYCn8scQWAYIkUWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 698057ab-1c8e-4189-2afa-08d99292f64d X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 23:56:55.2933 (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: BYAPR05MB5605 X-Spam-Score: -0.0 (/) 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 (-) From: Morgan Smith * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Add regex to handle filenames that have a fingerprint in them --- Fixed your problem. Well it was also my problem. The regex is pretty simple but probably a little intimidating if you've never done it before. I highly recommend reading up on ERE's and BRE's from the POSIX specification if you have time. I still don't exactly know how guile does regex but knowing POSIX regex has served me quite well. I've tested this patch and it works great for me on the latest emacs commit. It should also be backwards compatible so that's nice. gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9950d068..6ebcfecbc7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -183,9 +183,10 @@ (define* (emacs-byte-compile-directory dir) (let* ((libexec (string-append (assoc-ref outputs "out") "/libexec")) ;; each of these find-files should return one file - (pdmp (find-files libexec "^emacs\\.pdmp$")) + ;; there might be a fingerprint in the name + (pdmp (find-files libexec "^emacs(-[[:xdigit:]]+)?\\.pdmp$")) (pdmp-real (find-files libexec - "^\\.emacs\\.pdmp-real$"))) + "^\\.emacs(-[[:xdigit:]]+)?\\.pdmp-real$"))) (for-each (lambda (wrapper real) (delete-file wrapper) (rename-file real wrapper)) -- 2.33.0 From unknown Thu Jun 19 14:21:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH] gnu: emacs: Handle pdump filenames that contain a fingerprint Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 19 Oct 2021 18:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Morgan.J.Smith@outlook.com, 51258@debbugs.gnu.org, paxton@riseup.net Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163466911411500 (code B ref 51258); Tue, 19 Oct 2021 18:46:01 +0000 Received: (at 51258) by debbugs.gnu.org; 19 Oct 2021 18:45:14 +0000 Received: from localhost ([127.0.0.1]:52002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcu6r-0002zL-PT for submit@debbugs.gnu.org; Tue, 19 Oct 2021 14:45:14 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:52200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcu6p-0002ys-8c for 51258@debbugs.gnu.org; Tue, 19 Oct 2021 14:45:12 -0400 Received: by mail-wm1-f67.google.com with SMTP id p21so13655635wmq.1 for <51258@debbugs.gnu.org>; Tue, 19 Oct 2021 11:45:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=5iHNXQhJYWtUmb9lpPmfUVhgVZJDLgpTuen7mnEeSsw=; b=OHlHYylEikx1hx2buHPXt+ZfkQRfiH9wzHJ88mJVcrswBDP+xsBHWwrQKlk02ha10v 4UdGWRDvMT4+KTX1tdb6+u1ZnF3qtlg5JKjDmrX5EAdmp3uudhZvVHwDPXKWJtwr2PU9 UkCYzXl/27gdDYn12dP9iO8TX4vbhcI66GuiKUtmKSliZqwcwqWFBC3N49T6gckQe0Qd 2thWEp8qyDbwA8zNTPOor9vBfekHib3gVAUNE5BgBJnqkkhxWafYhBTMp0rWJc2/y9pv nVAE7JK/riavfRPBQggRZGsRSaeEe1k1WK3UD6riOJZ+YH3RkIQtiJPuSislziQA2T/4 aT7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=5iHNXQhJYWtUmb9lpPmfUVhgVZJDLgpTuen7mnEeSsw=; b=L+NGuUYoNzbW+b4KbOMI866TrZR/jJHzbYkE0Ai9iPugkH2jdf3Tdip4JWEFavgR9z hb7d09ie0oa7hAtcqR6NRzK7ywukv5BDmJFquKO+IiE4vS5HOzNr6B4fPtK1UfI7Z7qf JfrrzXolLZIngO6ohVj9qteINqXptSK/8wMybAinQCHk/RkCVeYFtI9RTUi2IMUlmI5/ Ai8o469riJ1ntRqgGHlwI1JSg519YscyCHpMItG1GtIPAh4ewTdJrYz2F9WZTWXhO1rH 56P9jjFe9pz8VjXieLhNpblLbcZ5mFOw3lBgmm8avQC2fZjNRW9PSo4O8lYaBKTzFDS/ ksAw== X-Gm-Message-State: AOAM530gWB1BR7y8+l+5IibXwXvBFtLZRVMjgb5MBkgDgyjPQaab3OUI 5zgKTVEkQgRLqoJzxqREfHw= X-Google-Smtp-Source: ABdhPJwLehKRU3h+/f4iSb+/gV+/2oAitM6toKrtbxOpn/Sko3U2Q82pLSi4+hpgZjuOJJXx4jmewg== X-Received: by 2002:a05:6000:1acd:: with SMTP id i13mr46085460wry.351.1634669105221; Tue, 19 Oct 2021 11:45:05 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i8sm12391522wrv.47.2021.10.19.11.45.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 11:45:04 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Tue, 19 Oct 2021 20:45:03 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 1.0 (+) 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, Am Montag, den 18.10.2021, 19:50 -0400 schrieb Morgan.J.Smith@outlook.com: > From: Morgan Smith > > * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Add regex to > handle > filenames that have a fingerprint in them > --- > > Fixed your problem. Well it was also my problem. The regex is > pretty simple but probably a little intimidating if you've never done > it before. I highly recommend reading up on ERE's and BRE's from the > POSIX specification if you have time. I still don't exactly know how > guile does regex but knowing POSIX regex has served me quite well. > > I've tested this patch and it works great for me on the latest emacs > commit. It should also be backwards compatible so that's nice. > > > gnu/packages/emacs.scm | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index 6d9950d068..6ebcfecbc7 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -183,9 +183,10 @@ (define* (emacs-byte-compile-directory dir) > (let* ((libexec (string-append (assoc-ref outputs > "out") > "/libexec")) > ;; each of these find-files should return one > file > - (pdmp (find-files libexec "^emacs\\.pdmp$")) > + ;; there might be a fingerprint in the name > + (pdmp (find-files libexec "^emacs(- > [[:xdigit:]]+)?\\.pdmp$")) > (pdmp-real (find-files libexec > - "^\\.emacs\\.pdmp- > real$"))) > + "^\\.emacs(- > [[:xdigit:]]+)?\\.pdmp-real$"))) > (for-each (lambda (wrapper real) > (delete-file wrapper) > (rename-file real wrapper)) Hi, this might sound somewhat odd, but I think this solution could be a little over-engineered (also it does not match the case where the version is an actual version rather than a git hash). Perhaps instead we ought to simply look for the .pdmp-real suffix, construct the old file name and move the file back. WDYT? From unknown Thu Jun 19 14:21:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH v2] gnu: emacs: Handle pdump filenames that contain a fingerprint References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 19 Oct 2021 19:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51258@debbugs.gnu.org, paxton@riseup.net, liliana.prikler@gmail.com Cc: Morgan Smith Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163467136623346 (code B ref 51258); Tue, 19 Oct 2021 19:23:01 +0000 Received: (at 51258) by debbugs.gnu.org; 19 Oct 2021 19:22:46 +0000 Received: from localhost ([127.0.0.1]:52041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcuhC-00064T-88 for submit@debbugs.gnu.org; Tue, 19 Oct 2021 15:22:46 -0400 Received: from mail-co1nam11olkn2015.outbound.protection.outlook.com ([40.92.18.15]:22369 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcuh9-00064F-Sy for 51258@debbugs.gnu.org; Tue, 19 Oct 2021 15:22:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ttt8MJfAPIBF4LgEFrYO5Z2Z3GxAxQnKd040SQkYUnKnIriPnbovKU6Tf9v7afaNjvPzSaRjpYek0wyrscrk+kv1nxIqtrMaoVS/Fdc3M4oB8RSRX9oVssPGKCqOf7+3/GduLDT9ET7mq7npRhxidR3sHqDGfXzmsOWihZdk1R1BKwHFTNWMbhtJYkCtFSZqoIGSeRmVro9nNAU4Hms8g31mdxDPOgO5oe9EyuuY9wNqRs7LlS7OpWI+1yLtmn6vUPsIoKwIizb9YIqiIZtQqJTlgAC12t0GbWlEBfk06ARF9CM6Yvlr7uLnJhLrtrurs6V0UZDDh52VvWg1VFkHIA== 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=Wni8A3qDM2b0EN04sYAYhg9PS+qFHvJpy387YkDA6GM=; b=XycRAmqlnKjnVZgoew3h4K4ch+QSFjbwntIAqLOV+6emx2T/DQA8PkIUA/HXkwXpwci/+nglUwFIgfRQ88wqimi/le+LvSoOO05itTXJ9F8JQf/z3Dd24O2FyurX/KwSgTw+G0hGbW7wzilAYo8p1I3csbKkYNPKUGGCYlW98L3AI7MtEEzVlY38BwBbGPYL1AazdENrmmmEM8qXjLBbdbEXHJfKypRbYz8UxdktsNmwzT+cab3ESfb0N/RoUNPvuUY8P6m6HDGaPuqV3FplP5uwOU5TUMImSFw5oLSVBSTzslpQJnpgfp+u9Sajaiy5BsuF3WNmUB7ZYrthvHZWRQ== 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=Wni8A3qDM2b0EN04sYAYhg9PS+qFHvJpy387YkDA6GM=; b=dWiOKXZjOVNB81pcIjJKWlh+tSYnqDM5dMBywVymXoCTwRJBC2k1XqeDCTUjwdPn81/O79FESPn8ZyAvn5Kx4io8iQztlonT7F0kOTe1sp2dSulzR2PSbZ7uf11XnDw8Sa0lei5JsrybtqDC5yXwC7VXWcYCmgw8NYCtnZVnw1K1mNHbz43SiQHK5ZJhYW9TtemWdM6dmws56ktz+gFANiQofMK6Hjm1pZouf0mCne0PUwvR23dcpW02vgDbtYTf+T2A0+alZJxYajG1W4GtaNkHk3uK//+S9S+/Z00+n70qzttKZYmVvwqh5tKxMDsOiStVxtvmsD+2pT+3hyI8lQ== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB4855.namprd05.prod.outlook.com (2603:10b6:a03:4f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.9; Tue, 19 Oct 2021 19:22:37 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154%6]) with mapi id 15.20.4628.015; Tue, 19 Oct 2021 19:22:37 +0000 From: Morgan.J.Smith@outlook.com Date: Tue, 19 Oct 2021 15:10:09 -0400 Message-ID: X-Mailer: git-send-email 2.33.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [jT5wSWdWf0ErjH9Cgc4X+rgI5LLPYnvi] X-ClientProxiedBy: YQBPR0101CA0096.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::29) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211019191007.3108-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (170.52.80.188) by YQBPR0101CA0096.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Tue, 19 Oct 2021 19:22:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cecfbf4f-c6c5-4eb4-1abe-08d99335cf08 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXwBRntoGkOsgz/xfgMzmJZSgPOvvdwosW514JZ9sDRYyq6guK6eDApW+lNFJXBLbdbr6wNzxGx53fqxYrNSSGkVRiqiRnsrXgaNZW25TXe2LzP40xQG33Kw+HKaiRGNNFgYIzk56rJD0JA2rdDt+5k3VTdX4+eQZl82gcaJMPU/V8Q0eNmPwFb3UU0uP7UJCLCFGPa48SIO9KDadfBhAzB9vLyXzY0OMPxp+PIWHfONCllioCNgFk0XDmZqTh6WZdAuVVilg9gE55LiIfmp6N6MPfCpxQCca4ivpncnGax4D7r+h5w+N2CDuA548c6jAyRsGCbfndhCNWhCnaujvq8pzLDDIoZwPIGUcPyp9/dH4RzxsfaHVef9Vr1rqVXKCBEQ3dncQFMKj1PdGufkgKH7AYBMx2M0RePwSxWz0RyJdcCz+6o1i4YGI1lE4L3pDPkPJgktsLVZkWutcp+Q31X1wQXZp04kXMF7PC38oVehMdBOL8+icE5uJvoAndk/Hzha42dDokQw3v7OnTdT7FYOH6LGO9cyoDdOhxV4oz01imCh7MoALW+9zsFw7TGueg+5ojrsjudcRnlPUDj7r3cKjd36eKMlinj0PF9YMSUqGi8xQL6WFdBmv/eWK2hF4FLf3IL2jr+JkX01ROLFv8naWSEbADHv+6VgihqBWZftfUPtwzhLSyUqPIDFYkUw6qR7/I9BhTlSc7/YMgwil9T/cIQrX7S5xo= X-MS-TrafficTypeDiagnostic: BYAPR05MB4855: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: InmUqWoyfnGr14DZgw/iGlwAymGEvSUoeiyZJI8OjfL35c8No3Xw1gr2emkc7xskXpZTJIjYNSSYa+Hh+MeG6x0hcbPP8jeihNAuvQgZTRWwVlIx5wkVybvp+QydL/svG6JNiKCO2dzn3cJ/9p8NfGPuJMmZW6TsacY/4izhP8oRWzOMeKEY9qkGhyfWsYhwPGoBwD1ajzKscTaefaSC4C/DiR9K/LgC2Q98U/21TqhB3aAkSyzWMBMpZ42XbXesYjMlgAqz/NILO3zajjECURVbJO1ePNjh9GNPVWtMs7C9HyGSICXZLjv4NsCYPGBro7bik3C1FJE8CrwPV++gUy/YDTS5mIIKQ7hjbpHwVY/Fw2p7rle0oFnGYC/xxrKLHrbCF7GGkLBpFsA6a4FM7sVm6mM6zL16GMxoOaX9Zlv7DtMy8z4I2C6BMjgK9Rfjq0T4FPS75Ba8Ad9JEVUYO58G/ocG18wsRXH6FN/5AtHjqUabY8jPIdAqtp8mjEY0WFaIeo//lAp29h94rEzS/woRKSF8TpaPm7TpWkka1k8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oNKjg59u1L8PgfCge4MmyVeWnHVz8PKhqoCsH9xQawI85xPfXG+if0Fpo511iP+u/P7YDzIcXqUGcL5nj81Qol3NokchxxakNTcibmNSSRf/eIcluVDmxQbXCjv4avwLGimUyV+1ic9m0iK4jCH+6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cecfbf4f-c6c5-4eb4-1abe-08d99335cf08 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 19:22:37.0047 (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: BYAPR05MB4855 X-Spam-Score: -0.0 (/) 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 (-) From: Morgan Smith * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Change regex to handle filenames that have a fingerprint in them. Also remove #t at the end of the phase. --- I'm a fan of your idea. I tested this patch and it seems to work as expected. I do think that the fingerprint will never be a version and my original patch would've been fine. However, I'm not certain of that and there isn't a good reason to have a super precise regex here anyways. gnu/packages/emacs.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9950d068..2aae21be6d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -183,14 +183,13 @@ (define* (emacs-byte-compile-directory dir) (let* ((libexec (string-append (assoc-ref outputs "out") "/libexec")) ;; each of these find-files should return one file - (pdmp (find-files libexec "^emacs\\.pdmp$")) + (pdmp (find-files libexec "\\.pdmp$")) (pdmp-real (find-files libexec - "^\\.emacs\\.pdmp-real$"))) + "\\.pdmp-real$"))) (for-each (lambda (wrapper real) (delete-file wrapper) (rename-file real wrapper)) - pdmp pdmp-real)) - #t)) + pdmp pdmp-real)))) (add-after 'glib-or-gtk-wrap 'strip-double-wrap (lambda* (#:key outputs #:allow-other-keys) ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped -- 2.33.1 From unknown Thu Jun 19 14:21:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH v2] gnu: emacs: Handle pdump filenames that contain a fingerprint Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 19 Oct 2021 19:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Morgan.J.Smith@outlook.com, 51258@debbugs.gnu.org, paxton@riseup.net Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163467319226196 (code B ref 51258); Tue, 19 Oct 2021 19:54:02 +0000 Received: (at 51258) by debbugs.gnu.org; 19 Oct 2021 19:53:12 +0000 Received: from localhost ([127.0.0.1]:52050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcvAd-0006oS-W6 for submit@debbugs.gnu.org; Tue, 19 Oct 2021 15:53:12 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50981) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcvAc-0006oG-BY for 51258@debbugs.gnu.org; Tue, 19 Oct 2021 15:53:10 -0400 Received: by mail-wm1-f65.google.com with SMTP id o24so6646782wms.0 for <51258@debbugs.gnu.org>; Tue, 19 Oct 2021 12:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=eethx63+kQMVFsAsKjurtUyBKd0PPuOsWIpWsDX5nTg=; b=P1p1C1MdKl6lMjeBaylFqrLmMfiMaTpQRwwgFbYivwbpDNcL0C0wObNW2V6P5SrPNB 81yh1rsClAle/PHDN9fInxNJueSSpKPUoCm2XktwZprWPAJxqs+6yKVHUZVg7A9ry2fs BBJZNOyj3kzjGDnwF+w+twn3YDxap2DtS9dUMOUyd0pJsbwSjR0r3Kr0HJXaUcjOZwVt S94NrKRZJ6iiNjoC8tkc/2TQItiwel+Y2t2CE7XWsAAV7pk26XYYOHSDvc9mji7eAxT1 KRlkrbq0kegkS97Z4NO0FKwdcut/g5TpmLde0L43ymN2wKyij78zpE0WT0oDg9dH1cu+ MT6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=eethx63+kQMVFsAsKjurtUyBKd0PPuOsWIpWsDX5nTg=; b=kvZ4dvZupQuAFryuPd2z07DowEdQjDtaoZWoolvSbA0sMCsuTGIme+chQVHiPZm3fR wW7thtv8A21aaWZyFSIol0OAVlbSSQMfnOueDGKxMWXGeGXiq3bQpHFlDc+j8N3Uxa/O XojRdBlqbPrJJP9aOKQ6HlkBmgyyrzr1ClFPt963zMjFHxUvbdhxsEqjW1Ui72ZxoGfu T7D+GRNWUOKpY4li9JYp082M11u10365I8f48yzVeMXzL4C9sS1d6MKaYUE7GoU2dz90 Hc2vFfzYUpUMvsXUlCmIzqG99CbOr9Yxa2dL3ib09Wi5fvqS6r7DQew0o5SOCbnJQFg9 oNEQ== X-Gm-Message-State: AOAM53133MlwnWjTOAciEAgxdwyHWBiJhkuEX8gDFDqxLBvRYqcpgBun dU08GtlhSoAQBPtg416v7Wg= X-Google-Smtp-Source: ABdhPJx3VkZ1w/6fdjpMs/0CN61zkYIfjPS3tp9obx2ihU46VnRSzsjvZF1lL3mrf2KKWx5mimYoYA== X-Received: by 2002:adf:a183:: with SMTP id u3mr46181962wru.330.1634673184401; Tue, 19 Oct 2021 12:53:04 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id p12sm13574121wrr.67.2021.10.19.12.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 12:53:04 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Tue, 19 Oct 2021 21:53:02 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 1.0 (+) 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 (-) Am Dienstag, den 19.10.2021, 15:10 -0400 schrieb Morgan.J.Smith@outlook.com: > From: Morgan Smith > > * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Change regex > to handle filenames that have a fingerprint in them. Also remove #t > at the end of the phase. > --- > > I'm a fan of your idea. I tested this patch and it seems to work as > expected. > > I do think that the fingerprint will never be a version and my > original patch would've been fine. However, I'm not certain of that > and there isn't a good reason to have a super precise regex here > anyways. Mostly LGTM, but keep in mind that your new pdmp and pdmp-real could potentially match more than one file even if realistically there's only one to be matched. Hence why I've said we ought to construct the old file name from the pdmp-real, because find-files need not be sorted. > > gnu/packages/emacs.scm | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm > index 6d9950d068..2aae21be6d 100644 > --- a/gnu/packages/emacs.scm > +++ b/gnu/packages/emacs.scm > @@ -183,14 +183,13 @@ (define* (emacs-byte-compile-directory dir) > (let* ((libexec (string-append (assoc-ref outputs > "out") > "/libexec")) > ;; each of these find-files should return one > file > - (pdmp (find-files libexec "^emacs\\.pdmp$")) > + (pdmp (find-files libexec "\\.pdmp$")) > (pdmp-real (find-files libexec > - "^\\.emacs\\.pdmp- > real$"))) > + "\\.pdmp-real$"))) > (for-each (lambda (wrapper real) > (delete-file wrapper) > (rename-file real wrapper)) > - pdmp pdmp-real)) > - #t)) > + pdmp pdmp-real)))) > (add-after 'glib-or-gtk-wrap 'strip-double-wrap > (lambda* (#:key outputs #:allow-other-keys) > ;; Directly copy emacs-X.Y to emacs, so that it is not > wrapped Regards, Liliana From unknown Thu Jun 19 14:21:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH v3] gnu: emacs: Handle pdump filenames that contain a fingerprint References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 24 Oct 2021 01:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51258@debbugs.gnu.org, paxton@riseup.net, liliana.prikler@gmail.com Cc: Morgan Smith Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.16350381336530 (code B ref 51258); Sun, 24 Oct 2021 01:16:01 +0000 Received: (at 51258) by debbugs.gnu.org; 24 Oct 2021 01:15:33 +0000 Received: from localhost ([127.0.0.1]:37576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meS6n-0001hG-FT for submit@debbugs.gnu.org; Sat, 23 Oct 2021 21:15:33 -0400 Received: from mail-bn8nam11olkn2057.outbound.protection.outlook.com ([40.92.20.57]:49376 helo=NAM11-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meS6h-0001gy-UT for 51258@debbugs.gnu.org; Sat, 23 Oct 2021 21:15:32 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DttSj9ChFHktS2wLISYJw3uJ82JXIMBzwRj5XbEt0zdsL/UyM62Hq5fgyFdR7vaNSNO0fVKneTTr5AvXtxTS4KXJoj/qcM8W7F2/n5VWgMdDZFtKRfu82mi0nuMPPqeLIFueKvSFwpEEwQfHaWYev1f4dM55wTJ0WD1AV/4fHjUX/xCs40S6iQxXbvWSQ9DqxWb/pAvWC8XGd4I40o1+SNHjGoHQ20ZsgpDoagdtkY94NTmy9vood3EYyIYBVJf2y6CSjhp6Sd6Ut1+Rv9ySAFXSqtrYEFCAVIK7fwmEzZyOjQqniMVJF8gwxttKdjqp4seDGhPHZTdWLIxXcAx0Mw== 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=int8sUlJnXzh/BclgifOjfXl3Wojg/W+t2FRwDiNJzE=; b=AzSDDVEkqATFqGFYx3L6dkz1tBNdZFQ3WmSnNJqc3PKz+YiKWyVwjJW4/nVLjU12xa/DW1DnD2wcyfbeEyxllkiAXFrUH6618dksXEtB7BoBuCdI+dKJZc+C5bZkwKO77P4rRD3rCFZkg2t15HdXD9Jqs12ZWqlDzH848YKkMjqvAlRD4KaKZNpAaO1eXaB6vVSPp8XBIFAjVnekciDo4HJURe3SsrhUzj7JnsV1C+fRiJmEo0zVzrsjlbBnZHqTvajVe631AsIch3FTKCDidgzfddqznlyzO2LqexXDJ5Uh8c0Qo9Q8KB+DXPziWYPnpEN3KMHB2MlGSugqeAmkNg== 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=int8sUlJnXzh/BclgifOjfXl3Wojg/W+t2FRwDiNJzE=; b=sw0A3gJUoZjYVxoTbev9u7qguDq3sVAsTdSw/mSLVxc9cDlgW8ERQFlZkgzCw1DiA7aqmY32uXju2k0LVPO89ANbVtC1p+9XEfm2ZQdXYDvMwE3PR3wm43kpo0g9A6xNl+PefVzwz54bfEBzkgHoizKlLfhZXtXwQtsoaDSc+TX/TfT5p6MqzUiEZ3RuIxZJja73fSYQOXNWL259iK8ynd0ylM0s2KdBZbNU6Ma/sq7r7Dg/CsNDa4TMz1be6BVKq7+Vsowkssmxl/4wcDXUQoDGxfyRp+iIArDeLNwaNU1RP4Cs7dUxPTtz6pRXwpnk5jJhvNxi8JivtR+9B0CGdw== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB4261.namprd05.prod.outlook.com (2603:10b6:a02:f6::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.11; Sun, 24 Oct 2021 01:15:20 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154%6]) with mapi id 15.20.4628.018; Sun, 24 Oct 2021 01:15:20 +0000 From: Morgan.J.Smith@outlook.com Date: Sat, 23 Oct 2021 21:00:15 -0400 Message-ID: X-Mailer: git-send-email 2.33.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [hrRyI6O9ry1iVCVpsI69knBJyhevkgNl] X-ClientProxiedBy: YQBPR01CA0004.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01::12) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211024010014.12659-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from workpad.hitronhub.home (170.52.80.188) by YQBPR01CA0004.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18 via Frontend Transport; Sun, 24 Oct 2021 01:15:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 878a44a4-129f-4606-acfc-08d9968bbf12 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUM9Q2EBuqQX3AYmbXvRMdLLHqiHJFJ+WplnEJQmDf+P8KGm9R1v8d3Ymi5YTJVxXdC02VTlFKsD5nxgH8uqnrtbi98cu/7pVPsA7Pt55xrkGndnNo1wlXjYG4F8yivy+hjSPyoATB0/FZX5xMB9rTdbqun87Dou/cwTxb10z8+ZQS0kXagEBFD6YznJvIlEvQQr8WCU7ywNH5O6tATHOmLhuY9yWNsOugPY0WXEwSps0jp6ML0L06snSazTVvUBWWKgGU6ZTAXC1FrL8U0kppBE/f40/I6BhIkCAaF+qpkcOVC/wBxbDnvP0YourW6DLhIZBPU/7WAHMkiQvhVpnEgxN33TbI+4QNzEkmfnBxbQ9AoAhQwTta9WJ9QIo9Fa1JL6sbctPqQ7bNprKVwqoaOh7k6E1LXSt+bVNGgRc+91Y6+uzYcx3elKMQdc1lxzjyknN9iK5NO+CRmrL/e1HUbbs3Q6A/8TC+tiT5Q6kAaGcVPI8I/xZlIZRUc4GMWE551DYLzh+R1yJd5vnTFUAYZ9bJbfM5WT66mPYIpNRdreRxK/tCv1ajH3r+1vJz3n3yKZL9AaaGKnOIWPatwfQZtr6UfHuTFIHU1f+JT3IpYz4KdxnoNH9o8OZXD3EwRXyqfVecoYJkigWNNwR6kNSOxfEmGYpaL7bmsYJ1StWgtgC+GCmj38bKCTbnm79DAcx90gMXh6rGIoWNDi5Oa5aPUVLtxVtDHpbw= X-MS-TrafficTypeDiagnostic: BYAPR05MB4261: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ty0vkLxXRHsv+DeNrvqOYp92RRBFjtW6W07ZscjnqkgnvHjw6eCVKiqtRr+XncGyyjvQIAt4Aq+QZBoilItzlqEz+eMzH75iUOsD9dG4FT05u2h2WRiWQdIFWnoXljw4ukgFAd7d7oMOO6lbgZKG8WB80h9+LzmSLmiQghQIkJb9fbin+waEIRpI+vacYJN7GvTapXpH6k/gPQIDsKfp6ETGj3ULL+at9SIwFy/woKQ/l5DidnQpaWhU3x0wsXN4Yhn+4dMxWp+hX+VLLFCNBqvW5QyS6bpgPhcDhtVSqjHqtsbNbyB/lOpDZ4b9lMB0SpfsN+ZHbzqdhnRh+6+IzjyaEVUOcvWGwyv7RhH/Wdl2uPtXDNc/Vt7hkPzaEMKCkyUNU+PvwqIzzspVgsCMuNe5cwM5iaCYjDwFISF83vH57MbcIQHwaawTyuXvfhfBBlSo6SUDsC46roqOsWWSRJ2VJxr0ms7jhO3VTU3aAz2h6Ln+rUyk+VfNkxLZlTqsdlditICJRbiNkyrMupbU1GhYs/sDYwLtmqu000KbWMU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NjEJt+RKw9f3nlE/qrqVXSXo6l0bITvevO1RoIUPpLL08F7Y6uzhWm5X0pOVNC69rTtGmIcsQbqXPxoEby7WsgLN9roE9BYWZ4geRtZbXErNW/jy41hCp+KnQ+HGS4hR+J7h/ofPx+8HbWisfnZpJjSEJiXJQ1pNOYl7MUlUu/jEBxuDHCNDhss94ekpvg7+847EIiZjTPrSEn9GwKVeU8GApbDTiud4J5Mxlm8DqakricZoDZnK16l52XhZ0S6hYqGt1UwXAkrVr0g3ap2guRDcqVwgnUALnNf8QhXuzHIeRvWxauhup558fhOFuSq32p/bfXGpCqrSuXgo9OVJNz+XcMBvNJce+3J6iFVSwxwIe0SSLryS2+3RA0WWKGCwi1k2Ei5mWSadJnP+Un5yupsaLWc8FLgfkXN21hVJuFjzhAJniFxwX24SfmLQThZQcgJVyqReRVNlwoMkbtVL7ojeKXZ5p5owToC4kvTImbKC6JX0E+A1I/NpByuaDCX0rCmO3F9ooLF0Z0TFsNYz4HvxKx7qlZSr1ptsN9n80gw8T/Q3mPWYTDJrKoEeNjdoACdG2n9KJ5Zpq5B73GNOl8/DeGoGG2JCsOUW2GOQp2FEHfJFKljh8xV0PTBybwpawmSGO+jxtbwO/oWToTHni8e7+69J5L1+qzg765THL/JnEA5//dM85IyGNvx1+0RXNZQT4yuFSslhslQuax6+ug== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 878a44a4-129f-4606-acfc-08d9968bbf12 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2021 01:15:20.3206 (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: BYAPR05MB4261 X-Spam-Score: -0.0 (/) 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 (-) From: Morgan Smith * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Change regex to handle filenames that have a fingerprint in them. Remove #t at the end of the phase. Don't bother deleting the old files because rename will overwrite them anyways. --- find-files does sort its return so my previous 2 patches probably work great regardless of the number of pdmps we encounter (which will only ever be 1 anyways). Also the fingerprint is a 32 char hexidecimal number used to uniquely[1] identify the Emacs binary (well more specifically an earlier binary generated during the build process). If you put the version in there it would completely invalidate the entire purpose of this fingerprint. Different distros will have different fingerprints for the same version and that's the point. Here is another over engineered solution even though the previous 2 still work great. I'm not sure if I'm supposed to just throw a '(use-modules ...)' in the phase but if we want to use the #:modules argument then it will break all of the other Emacsen that inherit from Emacs since they use different build systems. 1. Hash collisions are a thing so maybe not actually uniquely gnu/packages/emacs.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9950d068..e25b79b832 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -179,18 +179,18 @@ (define* (emacs-byte-compile-directory dir) (add-after 'glib-or-gtk-wrap 'restore-emacs-pdmp ;; restore the dump file that Emacs installs somewhere in ;; libexec/ to its original state - (lambda* (#:key outputs target #:allow-other-keys) - (let* ((libexec (string-append (assoc-ref outputs "out") + (lambda* (#:key outputs #:allow-other-keys) + (use-modules (ice-9 regex)) + (let* ((pdmp-regex ".(emacs(-[[:xdigit:]]+)?.pdmp)-real") + (libexec (string-append (assoc-ref outputs "out") "/libexec")) - ;; each of these find-files should return one file - (pdmp (find-files libexec "^emacs\\.pdmp$")) - (pdmp-real (find-files libexec - "^\\.emacs\\.pdmp-real$"))) - (for-each (lambda (wrapper real) - (delete-file wrapper) - (rename-file real wrapper)) - pdmp pdmp-real)) - #t)) + (pdmp (find-files libexec pdmp-regex))) + (map + (lambda (pdmp) + (rename-file + pdmp + (regexp-substitute #f (string-match pdmp-regex pdmp) 'pre 1))) + pdmp)))) (add-after 'glib-or-gtk-wrap 'strip-double-wrap (lambda* (#:key outputs #:allow-other-keys) ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped -- 2.33.1 From unknown Thu Jun 19 14:21:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Paxton Evans Subject: bug#51258: closed (Re: [PATCH v3] gnu: emacs: Handle pdump filenames that contain a fingerprint) Message-ID: References: <4e87942686af0a94689f8ed22dedd5d1ea5b7af5.camel@gmail.com> X-Gnu-PR-Message: they-closed 51258 X-Gnu-PR-Package: guix Reply-To: 51258@debbugs.gnu.org Date: Sun, 24 Oct 2021 08:53:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1635065582-20848-1" This is a multi-part message in MIME format... ------------=_1635065582-20848-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #51258: emacs-next/git-master broken due to pdmp file naming changes which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51258@debbugs.gnu.org. --=20 51258: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D51258 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1635065582-20848-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 51258-done) by debbugs.gnu.org; 24 Oct 2021 08:52:43 +0000 Received: from localhost ([127.0.0.1]:37892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meZFC-0005PH-IT for submit@debbugs.gnu.org; Sun, 24 Oct 2021 04:52:42 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1meZF8-0005OY-Je for 51258-done@debbugs.gnu.org; Sun, 24 Oct 2021 04:52:41 -0400 Received: by mail-wr1-f66.google.com with SMTP id e4so6643022wrc.7 for <51258-done@debbugs.gnu.org>; Sun, 24 Oct 2021 01:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=K9E0EZl4lqI41J0S8WXzlcFd60AhuKkBXv/oV3lFr3s=; b=OFN3Ypn3AQf6+vBgkiH0p4NmaPeOksxWZDaux9UB1enwRe+RBju04mSZSU6wfB5HOK Bd0YwrAJMMBDH/AMxqFUqog4ac11NkaqrHovcjL/El3+uctcf3QQpQdl76IeYDsv7c/i dJRB14EHdUGuqcDgNnbUjh7j2jgSXxn7Kn2F+1AYwZ7Z5HdvxJ88/KJ+KcJXcmOg8WEG NtuYEdoJCPayV4zyiu6DxxKx3g38Izm6g3qekJzMRKSQ0DkHECinXcVuRm1ibK/cwuqf WKZP1CpYw/2j4CTHSItox5RC6zY21MqG+KHShHdmUclGaBumpHysfoVvXZyy4luNzaZV p+NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=K9E0EZl4lqI41J0S8WXzlcFd60AhuKkBXv/oV3lFr3s=; b=6DT46U4QXs5ryhSC7aIJ3SRuWT8eTaQBgvcnRXtQsxoYRdSSj6J0rcgiI6gt9WQv+t rCrERza+WwXk4ZkoZvuso5qIbvMNxedvqXFhanLsZYP/WB9+yYDaoWkDpBe7fi3MGycq Fh2wQmsudsXJzs2JL0jREly8Cs7wreIZQ6GNSoIJ4l4k0dzAyGK22m5654IPMpQ4kIqJ vkraRnY0lZdAYQB8gpMJtKGfAMW81dmQekt78TXNfK0WoGwAzzac/D0apLDJht9Svcn6 Z1wmscN7rvqlcc/PLyAYo6pbbZljSwdhnZz9FXLIo41vzIPso2tBfJ1cGseVfrhSZRIv Fc3A== X-Gm-Message-State: AOAM530IglvWewni9yKrjLE2ymqSJbh7bP9uXWtRBH2mTkfWBpLj9taI MQy2OfgNPhhn4DX9IART+gw= X-Google-Smtp-Source: ABdhPJzPuNjXWGybsTb5sC57Eza85cJ6+VW4TEWgT2nhwvbTrVFKGP2K9WUwBKP/37hg/qQRRgVAnA== X-Received: by 2002:adf:f9d2:: with SMTP id w18mr1689063wrr.86.1635065552568; Sun, 24 Oct 2021 01:52:32 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e18sm4218860wrv.44.2021.10.24.01.52.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 01:52:32 -0700 (PDT) Message-ID: <4e87942686af0a94689f8ed22dedd5d1ea5b7af5.camel@gmail.com> Subject: Re: [PATCH v3] gnu: emacs: Handle pdump filenames that contain a fingerprint From: Liliana Marie Prikler To: Morgan.J.Smith@outlook.com, 51258-done@debbugs.gnu.org, paxton@riseup.net Date: Sun, 24 Oct 2021 10:52:30 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 51258-done 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, Am Samstag, den 23.10.2021, 21:00 -0400 schrieb Morgan.J.Smith@outlook.com: > From: Morgan Smith > > * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Change regex > to handle > filenames that have a fingerprint in them. Remove #t at the end of > the > phase. Don't bother deleting the old files because rename will > overwrite them > anyways. > --- > > find-files does sort its return so my previous 2 patches probably > work great regardless of the number of pdmps we encounter (which will > only ever be 1 anyways). You are completely right, thanks for pointing that out. I've pushed an adjusted v2 with updated comments and everything. I also verified that emacs-next could be updated with a little hacking around patches that don't apply. Thanks! ------------=_1635065582-20848-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 18 Oct 2021 03:59:52 +0000 Received: from localhost ([127.0.0.1]:45564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcJoW-0008UJ-2h for submit@debbugs.gnu.org; Sun, 17 Oct 2021 23:59:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:44144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcDaU-0006q3-5M for submit@debbugs.gnu.org; Sun, 17 Oct 2021 17:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcDaT-0006lb-Vf for bug-guix@gnu.org; Sun, 17 Oct 2021 17:20:57 -0400 Received: from mx1.riseup.net ([198.252.153.129]:51100) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcDaR-0008OG-MD for bug-guix@gnu.org; Sun, 17 Oct 2021 17:20:57 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4HXXx102kQzDqBC for ; Sun, 17 Oct 2021 14:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1634505653; bh=T6DzXuxEoglXcFhxj4taYYvw2niD3zda9jV/tEyJteo=; h=Date:From:To:Subject:From; b=tQyBLfHiZKcuR3s8yeGTXkZWm+LvujVKxrP38b4MmWBC0+JQfqf5YW4S56GEuDAUV bRvUgbE4LXR90FzsCr/7OSXWaVwmi6qQf3xbA9uAJ5HMJa9aZpjj1uV6KhCCnQOxLA ELrIFj5Gkkvk/c1wEGI1Uuh0npDZqQLBHZyxSNG4= X-Riseup-User-ID: C3F7CFFC4D784B69D7C51B90991EEFA5A472411DF9101B4DF61B4389C191A053 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4HXXx06GCnz5vNY for ; Sun, 17 Oct 2021 14:20:52 -0700 (PDT) MIME-Version: 1.0 Date: Sun, 17 Oct 2021 14:20:52 -0700 From: Paxton Evans To: bug-guix@gnu.org Subject: emacs-next/git-master broken due to pdmp file naming changes Message-ID: Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=paxton@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-Mailman-Approved-At: Sun, 17 Oct 2021 23:59:51 -0400 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 (--) As of Emacs commit e81f1faca4382ed5c8f15fec84fb7c900a5468f9, building emacs-next with the git-master branch will cause some problems on Guix. The "emacs-next" build itself will work without any errors, but it will complain whenever you try run it: > emacs: could not load dump file > "/gnu/store/a5bx5v96snvgiv9r1b7i1im5ccn5mz54-emacs-next-git.master/libexec/emacs/29.0.50/x86_64-pc-linux-gnu/emacs-66e6890a5565f2bed1ee56075d21e0051d891a59200cdd092c0946403fb84ac2.pdmp": > not a dump file This will also cause new builds of packages that use emacs-next/git-master as an input to fail as well, with a version of the same error. Here's a (failed) build log for emacs-pdf-tools: > [top part snipped] > > make[1]: Leaving directory '/tmp/guix-build-emacs-pdf-tools-0.90-2.5f77dae.drv-0/source/server' > phase `install' succeeded after 0.3 seconds > starting phase `patch-shebangs' > phase `patch-shebangs' succeeded after 0.0 seconds > starting phase `strip' > stripping binaries in "/gnu/store/swfjir05k1bg22l50yawhibbv0y5qhr9-emacs-pdf-tools-0.90-2.5f77dae/bin" with "strip" and flags ("--strip-debug" "--enable-deterministic-archives") > phase `strip' succeeded after 0.0 seconds > starting phase `validate-runpath' > validating RUNPATH of 1 binaries in "/gnu/store/swfjir05k1bg22l50yawhibbv0y5qhr9-emacs-pdf-tools-0.90-2.5f77dae/bin"... > phase `validate-runpath' succeeded after 0.0 seconds > starting phase `validate-documentation-location' > phase `validate-documentation-location' succeeded after 0.0 seconds > starting phase `delete-info-dir-file' > phase `delete-info-dir-file' succeeded after 0.0 seconds > starting phase `patch-dot-desktop-files' > phase `patch-dot-desktop-files' succeeded after 0.0 seconds > starting phase `install-license-files' > installing 0 license files from '.' > phase `install-license-files' succeeded after 0.0 seconds > starting phase `reset-gzip-timestamps' > phase `reset-gzip-timestamps' succeeded after 0.0 seconds > starting phase `compress-documentation' > phase `compress-documentation' succeeded after 0.0 seconds > starting phase `enter-lisp-dir' > phase `enter-lisp-dir' succeeded after 0.0 seconds > starting phase `emacs-patch-variables' > emacs: could not load dump file > "/gnu/store/rv72rvqa3vh2vw7jpkm3d9ww0xb4ibxv-emacs-next-git.master/libexec/emacs/29.0.50/x86_64-pc-linux-gnu/emacs-4588128eef9937d195927b0cccee280697619db43041dd08b620788b8dd59b77.pdmp": > not a dump file I think this is because of some recent changes made to the naming of the Emacs pdmp file in the master branch. Previously, it just made a file called "emacs.pdmp" but now it appends the version or commit hash, i.e. "emacs-4588128eef9937d195927b0cccee280697619db43041dd08b620788b8dd59b77.pdmp". This new naming scheme started with Emacs commit e81f1faca4382ed5c8f15fec84fb7c900a5468f9. This might be confusing Guix's Emacs package recipe, which has a regexp that simply looks for "emacs.pdmp" when it does some cleanup after building Emacs. guix/gnu/packages/emacs.scm:182 and following: > (lambda* (#:key outputs target #:allow-other-keys) > (let* ((libexec (string-append (assoc-ref outputs "out") > "/libexec")) > ;; each of these find-files should return one file > (pdmp (find-files libexec "^emacs\\.pdmp$")) > (pdmp-real (find-files libexec > "^\\.emacs\\.pdmp-real$"))) So I think that regexp might need to be changed a little to accommodate those recent Emacs changes. That's as far as I'm able to get with it, though, as I'm not very good at Guile or regexps. -paxton ------------=_1635065582-20848-1--