(address . guix-patches@gnu.org)
-----BEGIN PGP SIGNATURE-----
iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYoBx2BUcYWxsX2J1dF9s
YXN0QDE2My5jb20ACgkQZjl/hPdmk/maOQD/eKjDD++k8i1M21NowXNQOvddM8gI
tWslmiEfkww5R4YBAIitCLDkIVHPaA8y2SCzdBFOGm03hUuFjXYtDD5YkXIM
=ZY2h
-----END PGP SIGNATURE-----
From ea1a707936936d428efcb6aee84afa4475f695a5 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 14 May 2022 22:16:38 +0800
Subject: [PATCH 1/2] gnu: texmacs: Use G-expression.
* gnu/packages/text-editors.scm (texmacs): Use G-expressions.
---
gnu/packages/text-editors.scm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
Toggle diff (39 lines)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 7cbad042c9..d4459f5579 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -876,19 +876,19 @@ (define-public texmacs
qtsvg
sqlite))
(arguments
- `(#:tests? #f ; no check target
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-icon-directory
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* "packages/linux/icons.sh"
- (("/usr/share")
- (string-append out "/share"))))))
- (add-before 'configure 'gzip-flags
- (lambda _
- (substitute* "Makefile.in"
- (("^GZIP = gzip -f") "GZIP = gzip -f -n")))))))
+ (list
+ #:tests? #f ; no check target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-icon-directory
+ (lambda _
+ (substitute* "packages/linux/icons.sh"
+ (("/usr/share")
+ (string-append #$output "/share")))))
+ (add-before 'configure 'gzip-flags
+ (lambda _
+ (substitute* "Makefile.in"
+ (("^GZIP = gzip -f") "GZIP = gzip -f -n")))))))
(synopsis "Editing platform with special features for scientists")
(description
"GNU TeXmacs is a text editing platform which is specialized for
--
2.36.0
From 888d590bc6d27fe43456ee636265915e46a81a3b Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 14 May 2022 22:19:06 +0800
Subject: [PATCH 2/2] gnu: Add mogan.
* gnu/packages/text-editors.scm (mogan): New variable.
---
gnu/packages/text-editors.scm | 36 +++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
Toggle diff (56 lines)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index d4459f5579..7759bfde41 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -55,6 +55,7 @@ (define-module (gnu packages text-editors)
#:use-module (gnu packages code)
#:use-module (gnu packages cpp)
#:use-module (gnu packages crates-io)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
@@ -899,6 +900,41 @@ (define-public texmacs
(license license:gpl3+)
(home-page "https://www.texmacs.org/tmweb/home/welcome.en.html")))
+(define-public mogan
+ (package
+ (inherit texmacs)
+ (name "mogan")
+ (version "1.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitee.com/XmacsLabs/mogan")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0flk12yic6jc996jqsmmd0wp40js04rdpvcdjkri0hbqrcvyni8v"))))
+ (inputs
+ (modify-inputs (package-inputs texmacs)
+ ;; Replaced by S7 scheme
+ (delete "guile")
+ (prepend curl)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments texmacs)
+ ((#:phases orig)
+ #~(modify-phases #$orig
+ (replace 'gzip-flags
+ (lambda _
+ (substitute* "misc/CMakeLists.txt"
+ (("COMMAND gzip" all)
+ (string-append all " -n")))))))))
+ (synopsis "Structural editor delivered by Xmacs Labs")
+ (description
+ "Mogan is a fork of GNU TeXmacs created by Xmacs Labs. Its goal is
+to customize GNU TeXmacs for everyone to enjoy it fluently and develop new
+feature for everyone to learn and create science and technology.")
+ (license license:gpl3+)
+ (home-page "https://gitee.com/XmacsLabs/mogan")))
+
(define-public scintilla
(package
(name "scintilla")
--
2.36.0
--
Retrieve my PGP public key:
gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F
Zihao