From patchwork Thu Jan 4 03:35:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suhail X-Patchwork-Id: 58343 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 1850627BBEA; Thu, 4 Jan 2024 03:36:16 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0F62427BBE2 for ; Thu, 4 Jan 2024 03:36:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLEWa-0001n0-En; Wed, 03 Jan 2024 22:36:07 -0500 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 1rLEWV-0001m8-Ki for guix-patches@gnu.org; Wed, 03 Jan 2024 22:35:59 -0500 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 1rLEWU-0007uh-E7 for guix-patches@gnu.org; Wed, 03 Jan 2024 22:35:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLEWX-0006A7-Oc for guix-patches@gnu.org; Wed, 03 Jan 2024 22:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68238] [PATCH 1/2] gnu: emacs-org: Update to 9.6.15. Resent-From: Suhail Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jan 2024 03:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68238@debbugs.gnu.org Received: via spool by 68238-submit@debbugs.gnu.org id=B68238.170433935623675 (code B ref 68238); Thu, 04 Jan 2024 03:36:01 +0000 Received: (at 68238) by debbugs.gnu.org; 4 Jan 2024 03:35:56 +0000 Received: from localhost ([127.0.0.1]:53426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLEWS-00069n-08 for submit@debbugs.gnu.org; Wed, 03 Jan 2024 22:35:56 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:24739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLEWP-00069W-66 for 68238@debbugs.gnu.org; Wed, 03 Jan 2024 22:35:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1704339343; x=1704598543; bh=SducHUZtUpkSO+sN5w5TgzP/0l2JSL6q3U5DAWmCQ1U=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=VQlHmNWV1Myfs4F4xZmStpnqIvcxciMG0a5q4VZHW59DTI/ImZ0FbCoSVSWBzbtTZ btkcpjdzi2AEEiQDdk43/z+iIAKgO55FzjErwLxC2ZhwCr2RwR8IiHYVb+af0q5xod T24fi6WQi6+FYBij1H8RhO8SKTldauFIm2zr7osK7cb7t0TNGuGnkwfZZfDS22BAFW VV8KUZ7HxXbDO7GVtHTDh4lTeDy/jpdu1P6HaNbKyK3mSKZFP6obkUyXZREqrRUPox LwV49VBdTeMiLaJbG3kmQaNLg3UbFJi78eGIYjRUGfroKnBcAcEynDJ4qqwkB3hb01 4dHQkCQ4Am88w== Date: Thu, 04 Jan 2024 03:35:38 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 38691229:user:proton MIME-Version: 1.0 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: , Reply-to: Suhail X-ACL-Warn: , Suhail via Guix-patches X-Patchwork-Original-From: Suhail via Guix-patches via From: Suhail 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 * gnu/packages/emacs-xyz.scm: Update to 9.6.15. Change-Id: I8f3a76631b588151cceca755730dfd8b7daf248a --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a24f4a106..e96a162721 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16533,7 +16533,7 @@ (define-public emacs-neotree (define-public emacs-org (package (name "emacs-org") - (version "9.6.14") + (version "9.6.15") (source (origin (method git-fetch) @@ -16542,7 +16542,7 @@ (define-public emacs-org (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0g59nfx8gqzkqidqvyvh83yd7mahjm9khhr1ccwqj3r4phwpciqx")))) + (base32 "1pd2v7496i52siz2q1v64n1v23f6j33rf5jx46fqbm16m3ldcjwl")))) (build-system emacs-build-system) (arguments (list From patchwork Thu Jan 4 03:36:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suhail X-Patchwork-Id: 58344 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 552CF27BBEA; Thu, 4 Jan 2024 03:37:46 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 7367A27BBE2 for ; Thu, 4 Jan 2024 03:37:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLEXV-0002Da-D4; Wed, 03 Jan 2024 22:37:01 -0500 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 1rLEXT-0002CJ-6D for guix-patches@gnu.org; Wed, 03 Jan 2024 22:36:59 -0500 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 1rLEXS-0003Ww-US for guix-patches@gnu.org; Wed, 03 Jan 2024 22:36:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLEXW-0006Bw-53 for guix-patches@gnu.org; Wed, 03 Jan 2024 22:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68238] [PATCH 2/2] gnu: emacs-org: Run guix style on emacs-org. Resent-From: Suhail Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jan 2024 03:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68238@debbugs.gnu.org Received: via spool by 68238-submit@debbugs.gnu.org id=B68238.170433940823782 (code B ref 68238); Thu, 04 Jan 2024 03:37:02 +0000 Received: (at 68238) by debbugs.gnu.org; 4 Jan 2024 03:36:48 +0000 Received: from localhost ([127.0.0.1]:53431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLEXH-0006BV-CP for submit@debbugs.gnu.org; Wed, 03 Jan 2024 22:36:47 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:24673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLEXE-0006BD-67 for 68238@debbugs.gnu.org; Wed, 03 Jan 2024 22:36:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bayesians.ca; s=protonmail2; t=1704339394; x=1704598594; bh=aPeyO48jSY0N1agXUYnae9fofH7W/+Eu+aDrsboWjUQ=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=tHiPER+pkdtYZiiozeiFubeRfQnJNnweH8tFXIy0ypuOl6PTUE+GCT/M564zybj+5 Elg1nMGTiJs7E5PHKAr1rVWv8/k+W94ihgP/T7zSAOmNhtd/jzW19nibKfSIgLtmHS Y+J2loN4f7n6pKc00qJn5mfb3OeOBMaB5CSs2AH6oxvhdFEKSatD7StocmnTiCu6iF cdNGPHA3xIpqmlrv2SPN9E2Kqbs+F6p1LErcY5Spfdv3j4mNQv0ryxERfBDaM1k6P+ 1e/iLK9OXgR06WiZkirDKM+Y9WdjecISjG/hVXJ1SbRkcvmUEtR5qdRSDCBzvHRx82 4XbLk4YyuIa5g== Date: Thu, 04 Jan 2024 03:36:31 +0000 Message-ID: <8fbdcd98736d93900eeee510ee623b12a9bc436b.1704332165.git.suhail@bayesians.ca> In-Reply-To: References: Feedback-ID: 38691229:user:proton MIME-Version: 1.0 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: , Reply-to: Suhail X-ACL-Warn: , Suhail via Guix-patches X-Patchwork-Original-From: Suhail via Guix-patches via From: Suhail 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 * gnu/packages/emacs-xyz.scm: Re-indent. Change-Id: Ia4159e59bb01a39c4c25f92e8840d4fafe28b0e3 --- gnu/packages/emacs-xyz.scm | 115 ++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 54 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e96a162721..43de121d5c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16548,62 +16548,69 @@ (define-public emacs-org (list #:tests? #t #:test-command #~(list "make" "test-dirty") - #:phases - #~(modify-phases %standard-phases - (replace 'expand-load-path - ;; Make sure `load-path' includes "lisp" directory, otherwise - ;; byte-compilation fails. - (lambda args - (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'expand-load-path) args)))) - (add-after 'expand-load-path 'bootstrap - ;; XXX: Generate "org-loaddefs.el". - (lambda _ - (invoke "make" "autoloads"))) - (add-before 'check 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; XXX: Running tests updates ID locations. The process expects - ;; a file to be writeable in "~/.emacs.d/". - (setenv "HOME" (getcwd)) - (mkdir-p ".emacs.d") - ;; These files are modified during testing. - (with-directory-excursion "testing/examples" - (for-each make-file-writable - '("babel.org" - "ob-awk-test.org" - "ob-sed-test.org" - "ob-shell-test.org")) - ;; Specify where sh executable is. - (let ((sh (search-input-file inputs "/bin/sh"))) - (substitute* "babel.org" - (("/bin/sh") sh)))) - ;; XXX: Skip failing tests. - (substitute* "testing/lisp/test-ob-shell.el" - (("ob-shell/remote-with-stdin-or-cmdline .*" all) - (string-append all " (skip-unless nil)\n"))) - (substitute* "testing/lisp/test-org.el" - (("test-org/org-(encode-time|time-string-to-time) .*" all) - (string-append all " (skip-unless nil)\n"))))) - (replace 'install - (lambda _ - (let ((elpa (elpa-directory #$output)) - (info (string-append #$output "/share/info"))) - (substitute* "local.mk" - (("^lispdir.*") (string-append "lispdir = " elpa)) - (("^datadir.*") (string-append "datadir = " elpa "/etc")) - (("^infodir.*") (string-append "infodir = " info)))) - (invoke "make" "install" (string-append "ORGVERSION=" #$version)))) - (add-after 'install 'install-org-news - ;; Install ORG-NEWS files in doc directory. - (lambda _ - (install-file "etc/ORG-NEWS" - (string-append #$output "/share/doc/" - #$name "-" #$version))))))) - (native-inputs - (list texinfo)) + #:phases #~(modify-phases %standard-phases + (replace 'expand-load-path + ;; Make sure `load-path' includes "lisp" directory, otherwise + ;; byte-compilation fails. + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases + 'expand-load-path) args)))) + (add-after 'expand-load-path 'bootstrap + ;; XXX: Generate "org-loaddefs.el". + (lambda _ + (invoke "make" "autoloads"))) + (add-before 'check 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; XXX: Running tests updates ID locations. The process expects + ;; a file to be writeable in "~/.emacs.d/". + (setenv "HOME" + (getcwd)) + (mkdir-p ".emacs.d") + ;; These files are modified during testing. + (with-directory-excursion "testing/examples" + (for-each make-file-writable + '("babel.org" "ob-awk-test.org" + "ob-sed-test.org" "ob-shell-test.org")) + ;; Specify where sh executable is. + (let ((sh (search-input-file inputs "/bin/sh"))) + (substitute* "babel.org" + (("/bin/sh") + sh)))) + ;; XXX: Skip failing tests. + (substitute* "testing/lisp/test-ob-shell.el" + (("ob-shell/remote-with-stdin-or-cmdline .*" all) + (string-append all " (skip-unless nil)\n"))) + (substitute* "testing/lisp/test-org.el" + (("test-org/org-(encode-time|time-string-to-time) .*" + all) + (string-append all " (skip-unless nil)\n"))))) + (replace 'install + (lambda _ + (let ((elpa (elpa-directory #$output)) + (info (string-append #$output "/share/info"))) + (substitute* "local.mk" + (("^lispdir.*") + (string-append "lispdir = " elpa)) + (("^datadir.*") + (string-append "datadir = " elpa "/etc")) + (("^infodir.*") + (string-append "infodir = " info)))) + (invoke "make" "install" + (string-append "ORGVERSION=" + #$version)))) + (add-after 'install 'install-org-news + ;; Install ORG-NEWS files in doc directory. + (lambda _ + (install-file "etc/ORG-NEWS" + (string-append #$output "/share/doc/" + #$name "-" + #$version))))))) + (native-inputs (list texinfo)) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") - (description "Org is an Emacs mode for keeping notes, maintaining TODO + (description + "Org is an Emacs mode for keeping notes, maintaining TODO lists, and project planning with a fast and effective lightweight markup language. It also is an authoring system with unique support for literate programming and reproducible research.")