From patchwork Thu Dec 2 17:38:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 34932 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 D7E9727BBEA; Thu, 2 Dec 2021 17:39:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 7450227BBE9 for ; Thu, 2 Dec 2021 17:39:44 +0000 (GMT) Received: from localhost ([::1]:57014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msq3b-0003xw-G4 for patchwork@mira.cbaines.net; Thu, 02 Dec 2021 12:39:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msq2x-0003vT-7m for guix-patches@gnu.org; Thu, 02 Dec 2021 12:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msq2w-0008Qf-Iq for guix-patches@gnu.org; Thu, 02 Dec 2021 12:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msq2w-0002dP-Gc for guix-patches@gnu.org; Thu, 02 Dec 2021 12:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48205] [PATCH] gnu: emacs-org: Preserve version information References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Dec 2021 17:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48205 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48205@debbugs.gnu.org, mail@nicolasgoaziou.fr, mike@rohleder.de Cc: Morgan Smith Received: via spool by 48205-submit@debbugs.gnu.org id=B48205.163846672910107 (code B ref 48205); Thu, 02 Dec 2021 17:39:02 +0000 Received: (at 48205) by debbugs.gnu.org; 2 Dec 2021 17:38:49 +0000 Received: from localhost ([127.0.0.1]:49157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msq2i-0002cx-QF for submit@debbugs.gnu.org; Thu, 02 Dec 2021 12:38:48 -0500 Received: from mail-dm6nam11olkn2051.outbound.protection.outlook.com ([40.92.19.51]:53724 helo=NAM11-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msq2g-0002ci-Br for 48205@debbugs.gnu.org; Thu, 02 Dec 2021 12:38:48 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cEnUMzOP3E/Cfirr5yXYvtsI5g8hOUQTpeYssnVXxQ3Ez7/4oDlIG4c5jtqyd7BuMhRzXkclAJytFKAqHQcZDoH9+SV2MPny1Fw4XSo4gtmLxqD0HD+ysqz6x/iznrlxsM8bj/Ddv0WMdUxs6QFt6Zigk2F+gC53TTTGY8d3U8QZCzXw3b5FD5mEVrAhyEgS5VtqtdquP7Hf46fUR5KqIvnyrC8/fiW43nJP1qBjI0ggexcNG4M92gWjbNEArqUapOE8wmek5HYP3zfUZy6S3OSEuZh70OXTZK2zzbLvw7VI97e/9/S6NKfKGy1YwoBCGLtPZB9h7ONccJj9ngvsrg== 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=Wdj60EqB4ptfPgzH0bONjdFvFvaPkt6TyM8uXoMHGF4=; b=CSeIjwOwO10cdV2XmdqgVGbyXdpFhZVu2O2apddrEZvua8pdBUiHNmx9w3K5gP8tSmF1fuoe/na+IMlCmfytTOrrJ7nsImi3HtNB5sgQl7U89+0U8LHI6x8wUBmQooayYmUVRkarzuyl4ZxvGdto0NgHT49Hi9vkVIZg0gAtJLd/tETPA2ILJkZNZkj3XFvctQy1S/xIPp0bAZZul1ycxDj4lkkBrgsKZYxWu9rrPA86YUlV0aDjS4gwcenKKsSnW7qvWfvxMFgIw6Pw6jSwDyVzDknb7yfh28qqBNRSPfGHgN5npIPzc5nKC2+5z5PxIIeE3RQ8nOOMRZf+QLVOhg== 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=Wdj60EqB4ptfPgzH0bONjdFvFvaPkt6TyM8uXoMHGF4=; b=L2Hg3eYioIJO330eW1df8S1wq9PqUxj5m1u1l/PKaLHUscAKcAozIaAELif55Bd3qGUXQl0XHn+B8EWKaV//3Zfn6EY0f1FO5YKCsvL4LEbpfLnUsHcjyEvZPxklRKjhjVNzC2yKsoCS2MdPRO8Zfw+fnuDUZB9CyCdTt0BN3PHCnTPWyMLQwPt6R/pBSETxdXbQEcXbeVdMHKLKZxRgP9UynzgsuibiCoLTWzw+6Kr+qGFEk+DXCik+hQPbMyCnEO/R963vFAGRxlJWNOQTW1ZrqhZwQSGC4AuljQZ0sJvCiAe6kzwZ+rZGZ9+C9Sr3+HRHpUPgFRUAXRmN4kDTYQ== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB5349.namprd05.prod.outlook.com (2603:10b6:a03:7f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Thu, 2 Dec 2021 17:38:39 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::d0d:4cad:e0e6:dca]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::d0d:4cad:e0e6:dca%6]) with mapi id 15.20.4755.011; Thu, 2 Dec 2021 17:38:38 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 2 Dec 2021 12:38:02 -0500 Message-ID: X-Mailer: git-send-email 2.34.0 X-TMN: [pRKPxz3Xq4neX7xV/dSn5ZcxXqlfhEVR] X-ClientProxiedBy: YQXPR0101CA0019.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::32) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211202173801.3515-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (170.52.80.188) by YQXPR0101CA0019.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.14 via Frontend Transport; Thu, 2 Dec 2021 17:38:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27bba36c-7a58-428d-e3eb-08d9b5ba92dd X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXnrnTKVombrxkW9xGrTHPPRIy2VJwD8Ywf2f62eJq2d2uJCvTkUXyf8tKdzkym2C3EmKNBPOSn0WjJnohRfIeEE1GQpIQJ3HWkl9wDYbLrns3AsfZqqRgNneZXhBUQCcj0ToybEfkPSA154sPA+06nmxrtix/FbO4QZa4bQqITdEhRk3vc54haq0yUQEQOQ1+7f00Hx24mPqCU8ScH0ADWppA7bbrEkRPKS+lLk3PgstaIk0/FnLBdVypII9ARRbOyoTLNoW49RU30oh5Q+j/m4w3P/p9xg98Ahw3SRWQiDHvKlOXql2uqETUVSgrr+YHyoqnVNzFgrkbDVax7Z1rEbXN6CrmcH4TOPP+dGUUFUJRFdCc6YeeBYcqB3Kn2KVK8T1v3z2jxkvPARzs11IO2b2EDpw9+FZ0o0QHRis0vaNmMsDyt2KHFjrGkbjUDJgAcCRz1pvcLipLYJaefNuf/bkIuYpTuZl2yY5xtk4Ue4ATI711jWqbF7ZUaynsWWD1A/YnXaqPlwpdWrLriI3/hE0NkP77SWkYzeP6TQk62yUOhlREQmUDYDLk4EPcWFfOKq9AwCUzq67a4KqSt3olY/VfJ2gFp0m9FViw4OROJ9PNcVkLseTWXvCwgX0nnrOsdn4QdShuYNQAlaxIPVt5kekCfNf4Egg8ZWn4vjz+C54x8NFJnFVJghSsCh9rNin1jhX2CY4vDddDf+LLGNp++oRM82zQfoMo= X-MS-TrafficTypeDiagnostic: BYAPR05MB5349:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wEKMTYB7SZC5EUktRDpDWkNXJBVJC7n4U5treZ0RJoRAhtQh+dP+mSiCe8J+5U9jT0clIvIKB+KM3FF0spgcRskp7KhG0VHVZyrURp2QK1gjyPVhObhS2piAnPnipyRva0GENMJqfkNrKWzaFkY61Xwbe59rL5mrdDCw8mgaKcrGlavZeEXJn9hw6iCpLOkbVJ1JzxhObURX0N6F6aRT/Hs+0hwxjkwFY45W8tNkYbIAAoG8Mm4tOHyrn6Wkccu0+29lxpwKDn0rfYuJGL0QDFWh5tWhwgSbvOi0waJ022SqRxzJYLxEQk4Y8Pia1ufH31eNCnEsrTVGliTJ75BcqlsfknG3BX3bHtgG4Ktwr7v6kfY8aOa5QNSb+S80VfdcuRBFMqwOP6Qb62decfCarg+Qkd4f71Z+f5+foNfGWUanniPlRzcKf0CHDijHRrN+vo8rOhmiFlm0+CPU+NS4dpjcHXv4BCB21vYAloSbT3Q1gucJaeFQYbzQTdUGZdagLPgxidO+krOYkjJeMctvidoa+qB68hMUZmm/Es70Z2hFmx4mQKNQTgqOAe8CygtCvx//KVnHU0bhZvtbP+6rTA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jkSVMG6cXRI0SS8EE/wUQGz2tyyiV3QuJel82ceRQO2x0ZQdWRlha+nggPSMdRC05stsq+MshCoEro9P4gKh0unsLXUC3kWVlJYu20ToSZ97IpNboX79VXe1e6Z7J8uKrlpso476mmg9/5Xhs3GQ82fR3vjDq9FFmkUzEiqTjNogqz0Lg0P41c4xe5RSBWha4F4CIIkdJ94oDFBxkNApdb71tQBNnfpIgpwfJBB8ymKi3A5NVA/ku8qKcLSyMghWu7b6AHdMFE/LXnSY2a24r9+HMPeoK/YKPm3tUald8Uh88Y4YvdmPOVfQoXRQ1QBVNwFRUYQ/BTWOFULLv+l7HWnjwhjQj5SXeyErhW9tsG6d4i2Tizf2RxOPpxWceMm3RnsUtGGPnz1zLl1uPB5hJQXlT6yE8Ag5Nywg/Ic7NNzNOV27pp75QVgbblcLKZw4iENZaMWVn0nHXgG+iGpJAr0S5GPi1akBgAxLzNDxvXu8E63z+bvvPDAtA8tgz/8fhOyvqVKVTVjV/Ljfk2cjshjLsXpgl6iRc+1XNM9fKxSqZulkua/6SESSCerRCjhkCgr7aArFT9HjlEJskrOXbk2FGVK1QKdvvIcV2a4f/fTKvDN/Ie/+MmW8TzwJDlITEJL8aJp9MhRf0SwDpvUAhjLjLJTvz7RmIxlD9s8rI04bbTfzLWBNbfzTWodNBwdN5S7wJ7y+mQwgsLR+qi24xPIAQ2PTdBvXt6wy0N80o+C3L4+Ul54YNnJPb2yC+c0vg5KY9CzdnGK6b7cjcvqfouSUCRYpsos+YSD4MXMXGH5uoDOPCl2h+AKXDMdrkOkbcIBtQOqWgc43qcBDmvJYAZMLsGcPoa6PEwR5CXwjybiZGmtC3t5n6BZB3z4WdajHiFaz576JJJafvF0IoeZqpu9mQikBMO4dbFuAMRDyxoGrtvyUeveaCqeDAHXL4NNj/PeFjBqJrithiNND6JN/Ug== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27bba36c-7a58-428d-e3eb-08d9b5ba92dd X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 17:38:38.8442 (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: BYAPR05MB5349 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/emacs-xyz.scm (emacs-org)[#:phases]: Prevent install phase from deleting the version information --- Fixed it! gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1d4c682482..9ced8198c7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12463,6 +12463,10 @@ (define-public emacs-org (("^lispdir.*") (string-append "lispdir = " (elpa-directory (assoc-ref outputs "out"))))) + ;; The dependent targets for install perform cleanup that + ;; partially undoes our make phase + (substitute* "lisp/Makefile" + (("^install:.*") "install:\n")) (invoke "make" "install"))) (add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys)