From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qL7IJR5ygGIJIgEAbAwnHQ (envelope-from ) for ; Sun, 15 May 2022 05:23:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QNvNJR5ygGJ9OgEA9RJhRA (envelope-from ) for ; Sun, 15 May 2022 05:23:10 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0AFC93A707 for ; Sun, 15 May 2022 05:23:10 +0200 (CEST) Received: from localhost ([::1]:38720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq4qa-0007hf-H7 for larch@yhetil.org; Sat, 14 May 2022 23:23:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq4qV-0007hX-3M for guix-patches@gnu.org; Sat, 14 May 2022 23:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq4qU-0005Eg-RZ for guix-patches@gnu.org; Sat, 14 May 2022 23:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq4qU-0000nj-La for guix-patches@gnu.org; Sat, 14 May 2022 23:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55423] [PATCH]: gnu: Add mogan. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 03:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55423 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55423@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16525849593034 (code B ref -1); Sun, 15 May 2022 03:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2022 03:22:39 +0000 Received: from localhost ([127.0.0.1]:47792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq4q4-0000mp-8p for submit@debbugs.gnu.org; Sat, 14 May 2022 23:22:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:47784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq4q2-0000mi-TN for submit@debbugs.gnu.org; Sat, 14 May 2022 23:22:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq4q2-0007ew-No for guix-patches@gnu.org; Sat, 14 May 2022 23:22:34 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:42714) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq4pv-0004IM-TS for guix-patches@gnu.org; Sat, 14 May 2022 23:22:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=FjJp4 bqjgSdwNbYYM2Duo6M5UklPWKjhXCBBLnjxq/s=; b=SCfFg3g3I/kmY78e7+GVq GFbLt8olbYSldxtNMciwkhmdhHuurg04fKXujjuQ86l+PUvVyppxFyJeZUZBNHJ2 mvwYPrk4dnHmxqrAOeGhFIGVBFFVmIGZZWdHIwFTuC+z7NFUGjgKOqC9Ihkd5bRI Dnm1j+QCnsN42g5+lGRR64= Received: from asus-laptop (unknown [27.38.118.8]) by smtp1 (Coremail) with SMTP id GdxpCgA3Lp_dcYBiF4IZCg--.29376S2; Sun, 15 May 2022 11:22:06 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Sun, 15 May 2022 11:21:38 +0800 Message-ID: <86wnen5vl3.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgA3Lp_dcYBiF4IZCg--.29376S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUjZXrUUUUU X-Originating-IP: [27.38.118.8] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiKR8Cr1Xl3WRfwAAAsN Received-SPF: pass client-ip=123.126.97.1; envelope-from=all_but_last@163.com; helo=mail-m971.mail.163.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, T_SCC_BODY_TEXT_LINE=-0.01, URIBL_CSS_A=0.1 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652584990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=FjJp4bqjgSdwNbYYM2Duo6M5UklPWKjhXCBBLnjxq/s=; b=cya0L7U25fFlaNSeWdqb2n2QMcW3l22hYDF3cWNpPjpDERAkB+3QMsKPBXRVpDn0F7/tWG LeRyRtXn08NUkRTWK+Tsu3NBtd3SIx7pEZlkfjVnVNV0HWGsm/Cgv7LcTZvPhdfSlQ2MU1 w1QVGoR91oDByCSfcNyEhvCubpvIAECkdknR6ZTq/t6Nz89hjbie170krqxSsRatlWjcb2 eBR4wpjlFf/TNhDNHURubzRG1PuZLa7Na2iCZJ42wgQjZVSguG8REA0jEet8GfTyh66FQ2 qsr9JfKSoubQfEGWBgcuVFTPIqcgZthoILDWzHaDwvSG3uVMoMAS5sKcIBZhkw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652584990; a=rsa-sha256; cv=none; b=GMQDdXk038mlmhXWJUTZQm2flAJ19j81skUzqWfZ3QsMVjQ2SN7SuFqhTAKwDY7mUjGOce jFUpZWhzQtxn52qjXoyx267jVcRjARy1DZUzHSr+RvJGQbbHod/DHmUQ9zKmayizne9mQm hrPSl9ZVNlHLQsUU2Pe+AYc2fegiF9jYRHw7eHdcfxK65TRWED9r9RNoqNJ5/Dc4ZxEu6z 4kjdgXc+4zbNjNq9V3HaRjLV711xiu4ItETVFdHOH3PCm6iYsDVzvxQgAgTqqoezXibKe/ PUwN9p495VRWmXMjKTBqNNP1zRaCuj0V3LT8HJ3nYmKnEPDteLt/WMX5RE0D8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=SCfFg3g3; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=SCfFg3g3; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0AFC93A707 X-Spam-Score: 3.67 X-Migadu-Scanner: scn1.migadu.com X-TUID: PiVGRD3u07Jb --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYoBx2BUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/maOQD/eKjDD++k8i1M21NowXNQOvddM8gI tWslmiEfkww5R4YBAIitCLDkIVHPaA8y2SCzdBFOGm03hUuFjXYtDD5YkXIM =ZY2h -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-texmacs-Use-G-expression.patch >From ea1a707936936d428efcb6aee84afa4475f695a5 Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Add-mogan.patch >From 888d590bc6d27fe43456ee636265915e46a81a3b Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=--