[bug#59101] [PATCH 1/2] gnu: texmacs: Use G-expression.

[bug#59101] [PATCH 1/2] gnu: texmacs: Use G-expression.

[Zhu Zihao]

* gnu/packages/text-editors.scm (texmacs): Use G-expressions.
---
 gnu/packages/text-editors.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index a16ce8a117..ca502994c5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -872,19 +872,19 @@ (define-public texmacs
            qtsvg-5
            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.38.0

[bug#59102] [PATCH 2/2] gnu: Add mogan.

[Zhu Zihao]

* gnu/packages/text-editors.scm (mogan): New variable.
---
 gnu/packages/text-editors.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index ca502994c5..cddbf06c90 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -59,6 +59,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 datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
@@ -895,6 +896,39 @@ (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.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/XmacsLabs/mogan")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "04wz6xmimjv2l6baxgzm8vyq5grg102m3l4wq8i6bglv529yp4ff"))))
+    (inputs
+     (modify-inputs (package-inputs texmacs)
+       ;; Replaced by S7 scheme
+       ;; TODO: Maybe unbundle S7
+       (delete "guile")
+       (prepend curl)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments texmacs)
+       ((#:phases orig)
+        #~(modify-phases #$orig
+            ;; The non-deterministic compression issue is solved in Mogan.
+            (delete 'gzip-flags)))))
+    (synopsis "Structural editor delivered by Xmacs Labs")
+    (description
+     "Mogan is a fork of GNU TeXmacs created by Xmacs Labs. Its goal is
+make 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 textpieces
   (package
     (name "textpieces")
-- 
2.38.0

[bug#59102] [PATCH 2/2] gnu: Add mogan.

[Nicolas Goaziou]

Hello,

Zhu Zihao <all_but_last@163.com> writes:

> * gnu/packages/text-editors.scm (mogan): New variable.

Thank you. I applied the first patch of the set. Some comments about
this one follow.

> +    (arguments
> +     (substitute-keyword-arguments (package-arguments texmacs)
> +       ((#:phases orig)
> +        #~(modify-phases #$orig
> +            ;; The non-deterministic compression issue is solved in Mogan.
> +            (delete 'gzip-flags)))))

Unlike TeXmacs, Mogan ships with tests. Could you also run them?

> +    (synopsis "Structural editor delivered by Xmacs Labs")

I don't think the ads is warranted here. Maybe "Scientific text editor"
is better.

> +    (description
> +     "Mogan is a fork of GNU TeXmacs created by Xmacs Labs. Its goal is
> +make everyone to enjoy it fluently and develop new feature for everyone to learn
> +and create science and technology.")

This description is not very descriptive. I don't have any good idea,
the repository is not very helpful for that matter. At a minimum,
I suggest to remove "created by Xmacs Labs" and separate sentences with
two spaces. The second should also be replaced.

> +    (home-page "https://gitee.com/XmacsLabs/mogan")))

Could you move home-page above synopsis?

Regards,
-- 
Nicolas Goaziou

[bug#59102] [PATCH 2/2] gnu: Add mogan.

[Zhu Zihao]

[-- Attachment #1.1: Type: text/plain, Size: 1241 bytes --]

Sorry for the late reply! I missed this mail in my mailbox :( 


Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Unlike TeXmacs, Mogan ships with tests. Could you also run them?

The "tests" folder in mogan is inherited from TeXmacs, I think it's OK
to not run them if we don't run the test of TeXmacs. 

>
>> +    (synopsis "Structural editor delivered by Xmacs Labs")
>
> I don't think the ads is warranted here. Maybe "Scientific text editor"
> is better.
>
>> +    (description
>> +     "Mogan is a fork of GNU TeXmacs created by Xmacs Labs. Its goal is
>> +make everyone to enjoy it fluently and develop new feature for everyone to learn
>> +and create science and technology.")
>
> This description is not very descriptive. I don't have any good idea,
> the repository is not very helpful for that matter. At a minimum,
> I suggest to remove "created by Xmacs Labs" and separate sentences with
> two spaces. The second should also be replaced.
>
>> +    (home-page "https://gitee.com/XmacsLabs/mogan")))
>
> Could you move home-page above synopsis?

fixed in new patch.

I also make Mogan use qt-build-system because Mogan cannot find the
breeze icon without XDG environment variables wrapping.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-mogan.patch --]
[-- Type: text/x-patch, Size: 2582 bytes --]

From c7d14125e93c497a15c27fb4ac90e1d33efc698c 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] gnu: Add mogan.

* gnu/packages/text-editors.scm (mogan): New variable.
---
 gnu/packages/text-editors.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index ed77113726..57341cd198 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -49,6 +49,7 @@ (define-module (gnu packages text-editors)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages aspell)
@@ -59,6 +60,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 datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages fontutils)
@@ -895,6 +897,39 @@ (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.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/XmacsLabs/mogan")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "04wz6xmimjv2l6baxgzm8vyq5grg102m3l4wq8i6bglv529yp4ff"))))
+    (build-system qt-build-system)
+    (inputs
+     (modify-inputs (package-inputs texmacs)
+       ;; Replaced by S7 scheme
+       ;; TODO: Maybe unbundle S7
+       (delete "guile")
+       (prepend curl)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments texmacs)
+       ((#:phases orig)
+        #~(modify-phases #$orig
+            ;; The non-deterministic compression issue is solved in Mogan.
+            (delete 'gzip-flags)))))
+    (home-page "https://github.com/XmacsLabs/mogan")
+    (synopsis "Scientific structural text editor")
+    (description
+     "Mogan is a scientific structural text editor, a fork of GNU TeXmacs.")
+    (license license:gpl3+)))
+
 (define-public textpieces
   (package
     (name "textpieces")
-- 
2.38.1


[-- Attachment #3: Type: text/plain, Size: 100 bytes --]


-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

bug#59102: [PATCH 2/2] gnu: Add mogan.

[Nicolas Goaziou]

Hello,

Zhu Zihao <all_but_last@163.com> writes:

> Sorry for the late reply! I missed this mail in my mailbox :(

No problem.

> The "tests" folder in mogan is inherited from TeXmacs, I think it's OK
> to not run them if we don't run the test of TeXmacs.

Fair enough.

> fixed in new patch.
>
> I also make Mogan use qt-build-system because Mogan cannot find the
> breeze icon without XDG environment variables wrapping.

OK. Applied. Thank you.

Regards,
-- 
Nicolas Goaziou