unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#55423] [PATCH]: gnu: Add mogan.
@ 2022-05-15  3:21 Zhu Zihao
  2022-05-15 11:57 ` Maxime Devos
                   ` (3 more replies)
  0 siblings, 4 replies; 13+ messages in thread
From: Zhu Zihao @ 2022-05-15  3:21 UTC (permalink / raw)
  To: 55423


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



[-- 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-texmacs-Use-G-expression.patch --]
[-- Type: text/x-patch, Size: 1947 bytes --]

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(-)

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


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

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(+)

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


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


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15  3:21 [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
@ 2022-05-15 11:57 ` Maxime Devos
  2022-05-15 13:56   ` Zhu Zihao
  2022-05-15 11:58 ` Maxime Devos
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 13+ messages in thread
From: Maxime Devos @ 2022-05-15 11:57 UTC (permalink / raw)
  To: Zhu Zihao, 55423

[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]

Zhu Zihao schreef op zo 15-05-2022 om 11:21 [+0800]:
> +    (home-page "https://gitee.com/XmacsLabs/mogan")))

Appears to be a mirror for <https://github.com/XmacsLabs/mogan>.

Also, what kind of fork is this?  Is the idea to (eventually) merge the
fixes and features into upstream, or are they going separate ways, or
...?  Basically, why package the fork (which comes with some technical
and social cost) instead of working with upstream?

Not saying it's forbidden to package forks, but rather for me the
default option is to only package upstream.

> + 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.

This description sort-of suggests TeXmacs doesn't want everyone to
enjoy it and such, which I don't think is good for relations with
upstream.  Maybe like ‘(guix)Synopsis and Descriptions’ suggests, write
about some use cases and features (that were added by the fork)?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15  3:21 [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
  2022-05-15 11:57 ` Maxime Devos
@ 2022-05-15 11:58 ` Maxime Devos
  2022-05-15 14:05   ` Zhu Zihao
  2022-05-15 11:59 ` Maxime Devos
  2022-05-15 12:01 ` [bug#55423] " Maxime Devos
  3 siblings, 1 reply; 13+ messages in thread
From: Maxime Devos @ 2022-05-15 11:58 UTC (permalink / raw)
  To: Zhu Zihao, 55423

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

Zhu Zihao schreef op zo 15-05-2022 om 11:21 [+0800]:
> +            (replace 'gzip-flags
> +              (lambda _
> +                (substitute* "misc/CMakeLists.txt"
> +                  (("COMMAND gzip" all)
> +                   (string-append all " -n")))))))))

-n = for no time stamp and reproducibility?  I recommend sending this
change to upstream (if accepted by them), such that every distribution
benefits.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15  3:21 [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
  2022-05-15 11:57 ` Maxime Devos
  2022-05-15 11:58 ` Maxime Devos
@ 2022-05-15 11:59 ` Maxime Devos
  2022-05-15 14:12   ` [bug#55423] What's the motivation of creating Mogan. (was Re: [bug#55423] [PATCH]: gnu: Add mogan.) Zhu Zihao
  2022-09-05 11:41   ` [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
  2022-05-15 12:01 ` [bug#55423] " Maxime Devos
  3 siblings, 2 replies; 13+ messages in thread
From: Maxime Devos @ 2022-05-15 11:59 UTC (permalink / raw)
  To: Zhu Zihao, 55423

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

Zhu Zihao schreef op zo 15-05-2022 om 11:21 [+0800]:
> +    (inputs
> +     (modify-inputs (package-inputs texmacs)
> +       ;; Replaced by S7 scheme
> +       (delete "guile")
> +       (prepend curl)))

S7 scheme appears to be missing in the inputs, is it bundled?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15  3:21 [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
                   ` (2 preceding siblings ...)
  2022-05-15 11:59 ` Maxime Devos
@ 2022-05-15 12:01 ` Maxime Devos
  3 siblings, 0 replies; 13+ messages in thread
From: Maxime Devos @ 2022-05-15 12:01 UTC (permalink / raw)
  To: Zhu Zihao, 55423

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

Zhu Zihao schreef op zo 15-05-2022 om 11:21 [+0800]:
> +    (inputs
> +     (modify-inputs (package-inputs texmacs)
> +       ;; Replaced by S7 scheme
> +       (delete "guile")
> +       (prepend curl)))

S7 is bundled in
<https://github.com/XmacsLabs/mogan/tree/main/src/Scheme/S7>.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15 11:57 ` Maxime Devos
@ 2022-05-15 13:56   ` Zhu Zihao
  0 siblings, 0 replies; 13+ messages in thread
From: Zhu Zihao @ 2022-05-15 13:56 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 55423

[-- Attachment #1: Type: text/plain, Size: 1910 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> [[PGP Signed Part:Undecided]]
> Zhu Zihao schreef op zo 15-05-2022 om 11:21 [+0800]:
>> +    (home-page "https://gitee.com/XmacsLabs/mogan")))
>
> Appears to be a mirror for <https://github.com/XmacsLabs/mogan>.

These two repositories are equal with each others. There's no "main"
repository and "mirror" repository difference. 

> Also, what kind of fork is this?  Is the idea to (eventually) merge the
> fixes and features into upstream, or are they going separate ways, or
> ...?  Basically, why package the fork (which comes with some technical
> and social cost) instead of working with upstream?
>
> Not saying it's forbidden to package forks, but rather for me the
> default option is to only package upstream.

This fork is created by Darcy Shen(sadhen), the maintainer of GNU
TeXmacs. IIUC, Shen feels GNU TeXmacs is more scientist oriented, so he
want Mogan to be programmer oriented[*]. For details, we'd better to ask
Shen directly.

I guess Shen is unhappy with the slow development progress of texmacs,
he created a fork to add the features he wanted to add to texmacs.

[*]: https://zhuanlan.zhihu.com/p/447372210 (Simplified Chinese)
>
>> + 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.
>
> This description sort-of suggests TeXmacs doesn't want everyone to
> enjoy it and such, which I don't think is good for relations with
> upstream.  Maybe like ‘(guix)Synopsis and Descriptions’ suggests, write
> about some use cases and features (that were added by the fork)?

OK, I'll change it to more netural words.
>
> Greetings,
> Maxime.
>
> [[End of PGP Signed Part]]


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15 11:58 ` Maxime Devos
@ 2022-05-15 14:05   ` Zhu Zihao
  2022-05-15 14:24     ` Maxime Devos
  0 siblings, 1 reply; 13+ messages in thread
From: Zhu Zihao @ 2022-05-15 14:05 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 55423

[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]


Maxime Devos <maximedevos@telenet.be> writes:

> [[PGP Signed Part:Undecided]]
> Zhu Zihao schreef op zo 15-05-2022 om 11:21 [+0800]:
>> +            (replace 'gzip-flags
>> +              (lambda _
>> +                (substitute* "misc/CMakeLists.txt"
>> +                  (("COMMAND gzip" all)
>> +                   (string-append all " -n")))))))))
>
> -n = for no time stamp and reproducibility?  I recommend sending this
> change to upstream (if accepted by them), such that every distribution
> benefits.

I'll suggest a patch to upstream. But I think we don't need these phase
at all. There's reset-gzip-timestamps in gnu-build-system and the
timestamp of all gzip files will be cleared in the build process.

> S7 scheme appears to be missing in the inputs, is it bundled?

Yes, it's bundled. But I don't have a plan to unbundle it. It's small
and we'll have more work to do if we try to unbundle. 

-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] What's the motivation of creating Mogan. (was Re: [bug#55423] [PATCH]: gnu: Add mogan.)
  2022-05-15 11:59 ` Maxime Devos
@ 2022-05-15 14:12   ` Zhu Zihao
  2022-05-16 10:39     ` Darcy Shen via Guix-patches via
  2022-09-05 11:41   ` [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
  1 sibling, 1 reply; 13+ messages in thread
From: Zhu Zihao @ 2022-05-15 14:12 UTC (permalink / raw)
  To: sadhen; +Cc: 55423

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

Hello, Darcy Shen!

We're planning to package mogan editor for Guix. Thanks for your work on
Mogan and GNU TeXmacs!

Please allow me to ask a question here: What's your motivation of
forking GNU TeXmacs to create Mogan?

So Guix developers don't know the difference between GNU TeXmacs and
Mogan and many articles about Mogan were written in Chinese. So we need
your help. Thank you very much.
-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15 14:05   ` Zhu Zihao
@ 2022-05-15 14:24     ` Maxime Devos
  0 siblings, 0 replies; 13+ messages in thread
From: Maxime Devos @ 2022-05-15 14:24 UTC (permalink / raw)
  To: Zhu Zihao; +Cc: 55423

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

Zhu Zihao schreef op zo 15-05-2022 om 22:05 [+0800]:
> Yes, it's bundled. But I don't have a plan to unbundle it. It's small
> and we'll have more work to do if we try to unbundle. 

From (guix)Synopses and Descriptions:

  8. Make sure the package does not use bundled copies of software
     already available as separate packages.

     Sometimes, packages include copies of the source code of their
     dependencies as a convenience for users.  However, as a
     distribution, we want to make sure that such packages end up using
     the copy we already have in the distribution, if there is one.
     This improves resource usage (the dependency is built and stored
     only once), and allows the distribution to make transverse changes
     such as applying security updates for a given software package in
     a single place and have them affect the whole system—something
     that bundled copies prevent.

I don't think resource usage is a problem here, but the security
updates and transverse changes bits seem relevant here to me
(also: bug fixes, less redundancy when checking source code for malware
or bugs, replacing the s7 used by applications by a custom one to test
out new features or performance or such, ...)

It's a bit of an investment now that gives some flexibility for the
future and avoids some potential problems (e.g. malware bit and
security updates bit).

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] What's the motivation of creating Mogan. (was Re: [bug#55423] [PATCH]: gnu: Add mogan.)
  2022-05-15 14:12   ` [bug#55423] What's the motivation of creating Mogan. (was Re: [bug#55423] [PATCH]: gnu: Add mogan.) Zhu Zihao
@ 2022-05-16 10:39     ` Darcy Shen via Guix-patches via
  0 siblings, 0 replies; 13+ messages in thread
From: Darcy Shen via Guix-patches via @ 2022-05-16 10:39 UTC (permalink / raw)
  To: Zhu Zihao, 55423

[-- Attachment #1: Type: text/plain, Size: 770 bytes --]

Because GNU TeXmacs is still using GNU Guile 1.8.x and Qt 4.x.



As one of the developers, I want to use S7 Scheme and Qt 5.x. That's the reason why I fork GNU TeXmacs.







---- On Sun, 15 May 2022 22:12:27 +0800 Zhu Zihao <all_but_last@163.com> wrote ----



Hello, Darcy Shen! 
 
We're planning to package mogan editor for Guix. Thanks for your work on 
Mogan and GNU TeXmacs! 
 
Please allow me to ask a question here: What's your motivation of 
forking GNU TeXmacs to create Mogan? 
 
So Guix developers don't know the difference between GNU TeXmacs and 
Mogan and many articles about Mogan were written in Chinese. So we need 
your help. Thank you very much. 
-- 
Retrieve my PGP public key: 
 
 gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F 
 
Zihao

[-- Attachment #2: Type: text/html, Size: 1496 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-05-15 11:59 ` Maxime Devos
  2022-05-15 14:12   ` [bug#55423] What's the motivation of creating Mogan. (was Re: [bug#55423] [PATCH]: gnu: Add mogan.) Zhu Zihao
@ 2022-09-05 11:41   ` Zhu Zihao
  2022-09-22  5:40     ` Zhu Zihao
  1 sibling, 1 reply; 13+ messages in thread
From: Zhu Zihao @ 2022-09-05 11:41 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 55423


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


Long time no see.

I updated Mogan to 1.1.0 and switch the source to github.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-texmacs-Use-G-expression.patch --]
[-- Type: text/x-patch, Size: 1949 bytes --]

From f754c24c0945dd2fc17881f37598262b612eee67 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(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 0c30a705b9..8a52e0ef41 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.37.2


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

From bf3c22e5f835725fd700176f0d1b1ec0ac28fe51 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 | 37 +++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 8a52e0ef41..24600b4148 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -56,6 +56,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,42 @@ (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.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/XmacsLabs/mogan")
+             (commit (string-append "v" version))))
+       (sha256
+        (base32 "0l7irs5w6f1dmzxz2p4c4vxc2w999yxy1qvhbcv5yh3kfbyzrf7z"))))
+    (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
+            (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
+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 scintilla
   (package
     (name "scintilla")
-- 
2.37.2


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


-- 
Retrieve my PGP public key:

  gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744

Zihao

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#55423] [PATCH]: gnu: Add mogan.
  2022-09-05 11:41   ` [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
@ 2022-09-22  5:40     ` Zhu Zihao
  2022-11-07 11:06       ` bug#55423: " Zhu Zihao
  0 siblings, 1 reply; 13+ messages in thread
From: Zhu Zihao @ 2022-09-22  5:40 UTC (permalink / raw)
  To: Maxime Devos; +Cc: 55423

[-- Attachment #1: Type: text/plain, Size: 4971 bytes --]


ping.

Zhu Zihao <all_but_last@163.com> writes:

> [[PGP Signed Part:Undecided]]
>
> Long time no see.
>
> I updated Mogan to 1.1.0 and switch the source to github.
>
> [[End of PGP Signed Part]]
> From f754c24c0945dd2fc17881f37598262b612eee67 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(-)
>
> diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
> index 0c30a705b9..8a52e0ef41 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.37.2
>
> From bf3c22e5f835725fd700176f0d1b1ec0ac28fe51 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 | 37 +++++++++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
>
> diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
> index 8a52e0ef41..24600b4148 100644
> --- a/gnu/packages/text-editors.scm
> +++ b/gnu/packages/text-editors.scm
> @@ -56,6 +56,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,42 @@ (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.0")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://github.com/XmacsLabs/mogan")
> +             (commit (string-append "v" version))))
> +       (sha256
> +        (base32 "0l7irs5w6f1dmzxz2p4c4vxc2w999yxy1qvhbcv5yh3kfbyzrf7z"))))
> +    (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
> +            (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
> +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 scintilla
>    (package
>      (name "scintilla")
> -- 
> 2.37.2


-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* bug#55423: [PATCH]: gnu: Add mogan.
  2022-09-22  5:40     ` Zhu Zihao
@ 2022-11-07 11:06       ` Zhu Zihao
  0 siblings, 0 replies; 13+ messages in thread
From: Zhu Zihao @ 2022-11-07 11:06 UTC (permalink / raw)
  To: 55423-done

[-- Attachment #1: Type: text/plain, Size: 127 bytes --]

Closed due to 59102.
-- 
Retrieve my PGP public key:

  gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC

Zihao

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-11-07 11:09 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-15  3:21 [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
2022-05-15 11:57 ` Maxime Devos
2022-05-15 13:56   ` Zhu Zihao
2022-05-15 11:58 ` Maxime Devos
2022-05-15 14:05   ` Zhu Zihao
2022-05-15 14:24     ` Maxime Devos
2022-05-15 11:59 ` Maxime Devos
2022-05-15 14:12   ` [bug#55423] What's the motivation of creating Mogan. (was Re: [bug#55423] [PATCH]: gnu: Add mogan.) Zhu Zihao
2022-05-16 10:39     ` Darcy Shen via Guix-patches via
2022-09-05 11:41   ` [bug#55423] [PATCH]: gnu: Add mogan Zhu Zihao
2022-09-22  5:40     ` Zhu Zihao
2022-11-07 11:06       ` bug#55423: " Zhu Zihao
2022-05-15 12:01 ` [bug#55423] " Maxime Devos

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).