[PATCH] gnu: org-mode: Fix build for development version.

  • Open
  • quality assurance status badge
Details
One participant
  • Morgan Smith
Owner
unassigned
Submitted by
Morgan Smith
Severity
normal
M
M
Morgan Smith wrote on 7 Jul 2023 22:21
(address . guix-patches@gnu.org)
DM5PR03MB31636D482169CFCC122A615EC52DA@DM5PR03MB3163.namprd03.prod.outlook.com
This fixes "guix build emacs-org --with-branch=emacs-org=main". Or at least
it will once they fix the recently broken indentation test.

* gnu/packages/emacs-xyz.scm (org-mode) [phases] <fix-tests>: Make all files
in examples directory writable instead of being very specific.
---

I'm sneakng in a copyright fix for me here as well. Hope that's ok. I did
non-trivial changes to this file in 2022 and 2023.

gnu/packages/emacs-xyz.scm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index dbe736e56e..fc1a6ec8de 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -76,7 +76,7 @@
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
;;; Copyright © 2020, 2022 Fredrik Salomonsson <plattfot@posteo.net>
;;; Copyright © 2020 Eric Bavier <bavier@posteo.net>
-;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
+;;; Copyright © 2020-2023 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 Peng Mei Yu <i@pengmeiyu.com>
;;; Copyright © 2020, 2021, 2022 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2020 Marco Grassi <marco.au.grassi98@protonmail.com>
@@ -15728,11 +15728,8 @@ (define-public emacs-org
;; 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"))
+ (find-files "."))
;; Specify where sh executable is.
(let ((sh (search-input-file inputs "/bin/sh")))
(substitute* "babel.org"

--
2.40.1
M
M
Morgan Smith wrote on 11 Jul 2023 00:40
(address . 64523@debbugs.gnu.org)
DM5PR03MB3163391825BD0EAB3DE0114BC530A@DM5PR03MB3163.namprd03.prod.outlook.com
Morgan Smith <Morgan.J.Smith@outlook.com> writes:

Toggle quote (3 lines)
> This fixes "guix build emacs-org --with-branch=emacs-org=main". Or at least
> it will once they fix the recently broken indentation test.

Update: they have fixed the indentation test
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 64523@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 64523
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch