From patchwork Fri Nov 26 05:12:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 34825 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 0816927BBEB; Fri, 26 Nov 2021 05:20:13 +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,URIBL_BLOCKED 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 5E50427BBEA for ; Fri, 26 Nov 2021 05:20:12 +0000 (GMT) Received: from localhost ([::1]:45236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqTed-0002J4-AB for patchwork@mira.cbaines.net; Fri, 26 Nov 2021 00:20:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqTeU-0002IZ-7s for guix-patches@gnu.org; Fri, 26 Nov 2021 00:20:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mqTeT-0001E9-V4 for guix-patches@gnu.org; Fri, 26 Nov 2021 00:20:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mqTeT-0003At-NJ for guix-patches@gnu.org; Fri, 26 Nov 2021 00:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48205] [PATCH] gnu: emacs-org: Don't use release tar References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Nov 2021 05:20:01 +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, ludo@gnu.org Cc: Morgan Smith Received: via spool by 48205-submit@debbugs.gnu.org id=B48205.163790395912141 (code B ref 48205); Fri, 26 Nov 2021 05:20:01 +0000 Received: (at 48205) by debbugs.gnu.org; 26 Nov 2021 05:19:19 +0000 Received: from localhost ([127.0.0.1]:58450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqTde-00039X-Ep for submit@debbugs.gnu.org; Fri, 26 Nov 2021 00:19:18 -0500 Received: from mail-mw2nam12olkn2010.outbound.protection.outlook.com ([40.92.23.10]:60129 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mqTda-00038z-EV for 48205@debbugs.gnu.org; Fri, 26 Nov 2021 00:19:09 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O12i0GvI9qcj8VyMvDAuZhnEXnzN3Bs68BqVTGCddMW3dZ1WLMmI6sJHKXJP47W7U3IvMbSJl3sySRR6lhEZOj4CL1/xRFafdErbEjqRzK84E7/Rg8cagCbzg45e/lLbth1z3iNDUIx76fob283+Q+JKiL/NMyK+sEMSz4rngNkPb9eC1mKp0Vkk36mSBlCwLlvZzwBbIbHER4Ce3W3tZ1ST9R9Vkq/h6epeh26IriCosmx16cCobPHpaxdntfSCfQbC+gtJ7fI4TgxDvdrZtqXoG8AFdd1m+TypQYBFMzHCRlzThIPx6qaOXa7xNbJKgzLFlUvqtFSeAbf1EaTd0Q== 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=nw07g7oanEshNohoUpES66jdvp9czIldlkOsSaAR588=; b=H6DAO5BVi3+b+qQk2pTgcd0Dc896/+7MwclABIDUg4kNJ9eTjYNvLxRxAZZoK95FlSSa/28KevkwIxNrV7c1qm0Bqr5dNjIgmTf0UbyeLLa8p+ty3FEC6ulNShh8PfUqib+MXGEL+wxbsFRCW+YzrgnzZLmb+smZH0HEUVW+kLoZrTXsSh5+8xA/fg6DWPyWfKSzcm6lHqGXCw2DyCbscvhFbi6h928aa+O2+9xeHHk2At9rr3N3RfzOHzrKUr5ZAvORDvTBuv0+L6Mphutg19uvOq/hl4k97qWlPCHPdWZYb1n8suuhD7IIJ3lVxHfUzX5gaztcWLF1CSS6DovgUg== 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=nw07g7oanEshNohoUpES66jdvp9czIldlkOsSaAR588=; b=iWghxekmLCzFpT5UH5jw4sODO6qE4S3daW9m0U3xLQuEcYWT72kfiRUH67Jhb9rOaneRQSIoQv1sDFUKn5B9NiiZ5CsaiMD1vIUrZmg/UcZHQq5gW63aCAlNVz+dOURFAfYWXWNlPkzv/bBJ+9wACwhp++C0KNrwaHuuY+87mpVyOABMYWnBieQdAPRMSbiVrbWNiS61Hx9lLLPDZrnqYyEj0LiKrgg+R6NOMn5qJBopV0725BEWxU46uudGB0/+AeJYdPAoZNob5QWEFXSu1MHFrO22tk+nB5bYqHQDR8Q7M16csgmks9eJFXfDsNZwC51FFyu4gkRVHwp+A2HPkg== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB4263.namprd05.prod.outlook.com (2603:10b6:a02:ff::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.8; Fri, 26 Nov 2021 05:18:59 +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.4734.020; Fri, 26 Nov 2021 05:18:59 +0000 From: Morgan.J.Smith@outlook.com Date: Fri, 26 Nov 2021 00:12:25 -0500 Message-ID: X-Mailer: git-send-email 2.34.0 X-TMN: [/M5El87KE0fXESSMF7ea5EbJZ9+EGMny] X-ClientProxiedBy: YQXPR0101CA0022.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::35) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211126051224.27659-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (170.52.80.188) by YQXPR0101CA0022.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Fri, 26 Nov 2021 05:18:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 75856696-0bf3-4f86-019b-08d9b09c405a X-MS-Exchange-SLBlob-MailProps: glx1RnfWrHd75wAWJkSPLibe65nYq/1/ehQpQK/XfptvT0/7v/Q5NzTyg4WYyVU2G5zMmWvWHCVoPbwh4FCu8xT6cqGHOhBW08ouYRhPCmsgrjwbkOm60QclYCJX6x9PxPsUlvC53jL4CgXmDS/kmIOtcrhQolfUKLUj1JUPXichk1R9hIj9xjzWPS5Rjr+kUXWJGLlyEqSJMqOSAVeYfZbTPqwzVeatrRwxzYdLNEa/aoNEymsIYdX26xnJuA8MtRYyBZwRHUOyHGG29Ff7l01VZ7IQwVgdqrTLdQAPedaFKd0UwsGFB90kxTcAPT6F/OrUwaO+uNDFZC17EEhN5YkCCKzMbfm8KUP2KupdiQJD89k0bepvWveJXTptmhMgRPsaVWs0Ih9fo5bAsGTxbCJ2xkyXu3P9sgT+niLKZaJoJupF/qA0toUpNIWdZI42wTUL/e3m2+Et+q9fZoNAYQ2SkscpR1O0yVBoFBlWg85fHmsu2qxzivdT3LQmtatK+KN5nuRT37MGeuDI+EVM15MeMvEKy62i1ltGg8PYcbENK+Zl7Q+EFyCPLTYK5de56ua8XZbiM/+NxGV/64HtXGXv2xDRf4lfzQmIKtszDZRB4A+h1ctgoLTa+TBRN8yQbynEQbThdJ0hDqku9LwdUtXVfF+FMD2nVxqbKIT7hsLSbWH+CbZPkfLxF0hgsvNQXRr1wmfkD9xaBthoOFFj1alK8vu9wyWp59UBB7sbDtuZv9oiY5NlzVZfiK5Ct4Xg3MIJKboPFNpo0i4SC+6FZdS39EiVeKgLWNYSkcZtvbj+qV0Q4ca5ZcetAaCRwmazNDdTrmh4jFc3Chu2V0lrc7gMMpHLYsfT X-MS-TrafficTypeDiagnostic: BYAPR05MB4263: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q5saM/OPCA2KbR0YwuCoBV/lLHgAETpOo3RDFNaKzHWHEvHOHIow8NBe4GnPY9+G3PyTypv4jMx6WU7aIZ1V1kWg8ktQlfG8nkzjTpngrjIrr7VywCMOI/lL7Mfoj4ULGdfOxyIwiLBNYcQVBNxBt5w6vGHaDbE/CwSuKeG5YLq039MQTuO2ObvtoIWIGs7x8lREA28wTCiSTrDNQ7u+GvuIxUcBNvj7TEMgsBBFhII40NVYqmyZAqXsiU0EvEsneOdRW+Y42WMXd1F/x3enyYsV3fLtbHF0piFpHpbV5AuCen6cO0cTT1i4aDzEIY6ugmVW+6OtUHg/rdpvicKNzhFL1rVvspzPHEnTahNjVA1nGMcwmaryRCSYcgbT+fUrcQ77YxAQ/eBMyvNC75ck0NJ80Ee7SADWXunB6KXNysbHgB4GvdMd4+BaPAItuxKtqmFdZte/xHvdHto8v3rWehFtwPc5w18Cr0MezIXu/d7XVfazZyh+ld3x5eZTGl6X03XfA6UupykXQ5Ee+IrCDI4qJu8YmRRMiyDu+zP1TQEosSUMvRgrXROfeYPZ+y2X8AcNdOoDPCBB4A/xo2MmtExu3o5fU1AqxE4SYOFaJayYyzSDQYB2q0FRveGQQh3q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WSEHBYkXrZw3i7r+1QiI2l57GIQzK4LTA7b4nUUPd9PunS2CXbvufWWUxreo5vR/Rt8vyI+bKf+FwoiwyhF4fzXQImQBATTShPoHreCdLGB8JC+z1f45myb724dq44pPfgTP4VBCub61H8j11X+Qp5DrOBCGpTFH1F7M98NnKdq0Yb0JIXa6npwBUIbheZAaPxAWMBslRhbYhVO/HboSTyoW7uYiom+rcy6D/hV1pr0aF9m7N8niA0dT33eV38wGlVPCZFNqcrer9cZrt4j1bym9s/qVhTie/NN97Y0j4W4/jSPzZYzTlUZebQq46Wh0Zr6pzbErNUO+GsCC61hk4G0D4hAw2pbhHaomHn8qlo152w5sIerA4ZrRtH6bWz9gmpjB0L94AcEUJHT/MHNtyq9FpO8x6aE28dXvoqaDXe+7HVKhdig5XJwWJx9BWRUZpokP2LF+T4JKi4K72gB04dy2v3CPVAGW3LcJpf/q/EIDCO1J61T6LqyKYqHihahkTNfqOSb+/AOJrK2d2vz1MVNLuwo0TD4YaZxP+KyENarsSw+rWUH2a0m8gBoCj+k61URSxBHj9MY0r0dH/QcPPw2b5+PeHvUk7jTPfNqhb207sGMMUvm00P4uM5aqjbJH2VFcC2FyIZxEq054nl9cLY1h1t2taYA4B7y/cf2Aet/QbiJxY+W1rKmiOgnL6IUUo0IbXtbwPNGIzWm0bHCbAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75856696-0bf3-4f86-019b-08d9b09c405a X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Nov 2021 05:18:59.6189 (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: BYAPR05MB4263 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): [source]: Use git repository [arguments]: Added phases to help with building [native-inputs]: Added texinfo --- So I still have no clue why the current emacs-org package is not reproducible, but I made a package that is reproducible. It also is building from the development source so people can use package transformations easier and it actually runs the tests. gnu/packages/emacs-xyz.scm | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0cc66b6787..ab7b6fcf6a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12439,24 +12439,44 @@ (define-public emacs-org (version "9.5") (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/emacs/org-mode.git") + (commit (string-append "release_" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "16cflg5nms5nb8w86nvwkg49zkl0rvdhigkf4xpvbs0v7zb5y3ky")))) + (base32 + "1gnzx53gkg2c6ljam31bvbibkra66lfx0w04jqmsv2gk8613527r")))) (build-system emacs-build-system) (arguments - `(#:phases + `(#:tests? #t + #:test-command '("make" "test-dirty") + #:phases (modify-phases %standard-phases - (add-after 'install 'install-documentation + (delete 'build) + (add-before 'check 'make + (lambda _ + (invoke "make" (string-append "ORGVERSION=" ,version)))) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let* ((share (string-append (assoc-ref outputs "out") "/share")) - (info-dir (string-append share "/info")) - (doc-dir (string-append share "/doc/" ,name "-" ,version))) - (install-file "org.info" info-dir) - (install-file "orgguide.info" info-dir) - ;; XXX: "orgcard.pdf" is not built in Org 9.5. - ;; (install-file "orgcard.pdf" doc-dir) - )))))) + (substitute* "local.mk" + (("^prefix.*") (string-append "prefix = " (assoc-ref outputs "out"))) + (("^lispdir.*") + (string-append "lispdir = " (elpa-directory (assoc-ref outputs "out"))))) + (invoke "make" "install"))) + (add-after 'unpack 'fix-tests + (lambda _ + ;; These files are modified during testing + (make-file-writable "testing/examples/babel.org") + (make-file-writable "testing/examples/ob-awk-test.org") + (make-file-writable "testing/examples/ob-sed-test.org") + (make-file-writable "testing/examples/ob-shell-test.org") + + ;; Specify where sh is + (substitute* "testing/examples/babel.org" + (("/bin/sh") (which "sh")))))))) + (native-inputs + `(("texinfo" ,texinfo))) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") (description "Org is an Emacs mode for keeping notes, maintaining TODO