GNU bug report logs - #68238
[PATCH 0/2] gnu: emacs-org: Update to 9.6.15 + style fix

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68238 in the body.
You can then email your comments to 68238 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Suhail <suhail <at> bayesians.ca>
To: Guix-patches mailing list <guix-patches <at> gnu.org>
Subject: [PATCH 0/2] gnu: emacs-org: Update to 9.6.15 + style fix
Date: Thu, 04 Jan 2024 03:28:54 +0000

Hello Guix,
This patch set updates emacs-org to 9.6.15 and applies styling
recommendations by 'guix style'.

Suhail (2):
  gnu: emacs-org: Update to 9.6.15.
  gnu: emacs-org: Run guix style on emacs-org.

 gnu/packages/emacs-xyz.scm | 119 ++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 56 deletions(-)


base-commit: f2102cb5b9239be2ed2023b908b726af542e0124
-- 
2.43.0

Message #8 received at 68238 <at> debbugs.gnu.org (full text, mbox):

From: Suhail <suhail <at> bayesians.ca>
To: 68238 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: emacs-org: Update to 9.6.15.
Date: Thu, 04 Jan 2024 03:35:38 +0000

* 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
-- 
2.43.0

Message #11 received at 68238 <at> debbugs.gnu.org (full text, mbox):

From: Suhail <suhail <at> bayesians.ca>
To: 68238 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: emacs-org: Run guix style on emacs-org.
Date: Thu, 04 Jan 2024 03:36:31 +0000

* 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.")
-- 
2.43.0

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Suhail via Guix-patches via <guix-patches <at> gnu.org>
Cc: 68238-done <at> debbugs.gnu.org, Suhail <suhail <at> bayesians.ca>
Subject: Re: [bug#68238] [PATCH 1/2] gnu: emacs-org: Update to 9.6.15.
Date: Mon, 22 Jan 2024 00:28:15 +0100

Hello,

Suhail via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/emacs-xyz.scm: Update to 9.6.15.

Thank you. I applied your patch, and bumped Org to 9.6.17.

Regards,
-- 
Nicolas Goaziou

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.