From patchwork Mon Nov 7 10:58:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44367 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 519B227BBEE; Mon, 7 Nov 2022 11:00:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC37727BBE9 for ; Mon, 7 Nov 2022 11:00:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orzre-0006Kf-47; Mon, 07 Nov 2022 06:00:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orzrK-0006IW-9o for guix-patches@gnu.org; Mon, 07 Nov 2022 06:00:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orzrG-0006iR-Fm for guix-patches@gnu.org; Mon, 07 Nov 2022 06:00:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orzrG-0004YX-CH for guix-patches@gnu.org; Mon, 07 Nov 2022 06:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59101] [PATCH 1/2] gnu: texmacs: Use G-expression. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Nov 2022 11:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59101 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59101@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166781875717416 (code B ref -1); Mon, 07 Nov 2022 11:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Nov 2022 10:59:17 +0000 Received: from localhost ([127.0.0.1]:33444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orzqX-0004Wp-1L for submit@debbugs.gnu.org; Mon, 07 Nov 2022 05:59:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:43338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orzqT-0004WZ-IL for submit@debbugs.gnu.org; Mon, 07 Nov 2022 05:59:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orzqT-00067U-26 for guix-patches@gnu.org; Mon, 07 Nov 2022 05:59:13 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orzqQ-0006bm-Hv for guix-patches@gnu.org; Mon, 07 Nov 2022 05:59:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=axHzW zBGxbAQBrPlrqas2ycE1NwrEt5wPJxxa6RIlbE=; b=M2aOL88rUjx9t+tJfwBHD Q8AovH7MQZM9+rIwC2L7JYYnpiyrA4LTlFt//SPCDR5svQDrDMSw+75Yqzt1y4xf KlOk96brRREPZhR/Rt3EBAM6ybY/E2m5cQArNfYwNRyYX1bGCgAXxSYE7TIb7RnE OtiG560ICVqU99I1v8fEFk= Received: from localhost.localdomain (unknown [27.38.249.137]) by smtp4 (Coremail) with SMTP id HNxpCgC3v3vc5Ghj2z1lqw--.13350S2; Mon, 07 Nov 2022 18:58:56 +0800 (CST) From: Zhu Zihao Date: Mon, 7 Nov 2022 18:58:26 +0800 Message-Id: <20221107105827.10327-1-all_but_last@163.com> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 X-CM-TRANSID: HNxpCgC3v3vc5Ghj2z1lqw--.13350S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7KFyUuFWDXr43XrWUJrWrKrg_yoW8Xry8pF 1xKr1I9w4FgrW5Jw47Xr4Y9r98Wry0kr4Ykws3Zw42kas0kFyxtr1YkrZ5uFy7KrW7ZayU Ar18WFW5ZF1Y9FDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JU7pnkUUUUU= X-Originating-IP: [27.38.249.137] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBCyr1aEAmQ6cgAAsl Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Mon Nov 7 10:58:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 44368 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 717BA27BBE9; Mon, 7 Nov 2022 11:00:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CF8BB27BBEB for ; Mon, 7 Nov 2022 11:00:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orzre-0006OO-VM; Mon, 07 Nov 2022 06:00:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orzrK-0006IX-F3 for guix-patches@gnu.org; Mon, 07 Nov 2022 06:00:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1orzrH-0006jB-2H for guix-patches@gnu.org; Mon, 07 Nov 2022 06:00:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orzrG-0004Ym-UI for guix-patches@gnu.org; Mon, 07 Nov 2022 06:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59102] [PATCH 2/2] gnu: Add mogan. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Nov 2022 11:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59102@debbugs.gnu.org Cc: Zhu Zihao X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166781875717422 (code B ref -1); Mon, 07 Nov 2022 11:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Nov 2022 10:59:17 +0000 Received: from localhost ([127.0.0.1]:33446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orzqX-0004Wr-BT for submit@debbugs.gnu.org; Mon, 07 Nov 2022 05:59:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:43346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orzqT-0004Wa-IM for submit@debbugs.gnu.org; Mon, 07 Nov 2022 05:59:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orzqT-00067V-5G for guix-patches@gnu.org; Mon, 07 Nov 2022 05:59:13 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orzqO-0006bz-7o for guix-patches@gnu.org; Mon, 07 Nov 2022 05:59:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=dN4Hs x9pfw8YKcG7hqZ9W2cutyYbpHxihWAcbLteOZ0=; b=THbbh/FCVlVxblGH+PC8z ObivEX6zS1K9z7fs8MlwTNUkOaE7oGVBzXcyZFM8BgrBhiytrcgD/CdZq4T9YKg+ movahCZ7cOLpo+yxumsEicio1O6pvg+is/bhEWTVcFF2uWjGNC/sbzmlQVV+LIw3 x1Q9TvT3uzSTGtsFqk1ekE= Received: from localhost.localdomain (unknown [27.38.249.137]) by smtp4 (Coremail) with SMTP id HNxpCgC3v3vc5Ghj2z1lqw--.13350S3; Mon, 07 Nov 2022 18:58:59 +0800 (CST) From: Zhu Zihao Date: Mon, 7 Nov 2022 18:58:27 +0800 Message-Id: <20221107105827.10327-2-all_but_last@163.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221107105827.10327-1-all_but_last@163.com> References: <20221107105827.10327-1-all_but_last@163.com> MIME-Version: 1.0 X-CM-TRANSID: HNxpCgC3v3vc5Ghj2z1lqw--.13350S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJrWxZFyDKF17Gw4rXF43KFg_yoW8ZFy3pr WfGry5u3s5KrW3Ja93Wa129F1a9r95tFWUG3y3A3y5ta45WrWvyry2kws8Aasruw17Aw17 uw4fWF4xWFyY9rJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUwiSPUUUUU= X-Originating-IP: [27.38.249.137] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBOyr1aEAmQ6lAAAsA Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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")