From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 QKQQCxHnFWPsYQAAbAwnHQ (envelope-from ) for ; Mon, 05 Sep 2022 14:09:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OJoECxHnFWPNOwEAauVa8A (envelope-from ) for ; Mon, 05 Sep 2022 14:09:53 +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 B459B3779B for ; Mon, 5 Sep 2022 14:09:52 +0200 (CEST) Received: from localhost ([::1]:50174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVAvH-0001gL-PG for larch@yhetil.org; Mon, 05 Sep 2022 08:09:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVAVK-00079R-G9 for guix-patches@gnu.org; Mon, 05 Sep 2022 07:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVAVK-0003KR-42 for guix-patches@gnu.org; Mon, 05 Sep 2022 07:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVAVJ-0006D9-W9 for guix-patches@gnu.org; Mon, 05 Sep 2022 07:43: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: Mon, 05 Sep 2022 11:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55423 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 55423@debbugs.gnu.org Received: via spool by 55423-submit@debbugs.gnu.org id=B55423.166237817623863 (code B ref 55423); Mon, 05 Sep 2022 11:43:01 +0000 Received: (at 55423) by debbugs.gnu.org; 5 Sep 2022 11:42:56 +0000 Received: from localhost ([127.0.0.1]:46620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVAVD-0006Cp-Jc for submit@debbugs.gnu.org; Mon, 05 Sep 2022 07:42:56 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:34244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVAV8-0006CV-Tj for 55423@debbugs.gnu.org; Mon, 05 Sep 2022 07:42:54 -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=Etxq1 GPNcVuepKNFXPYm6LauC7xQb8fxbBV7nLyN+xk=; b=QtBuPPQawQ6+JBTwhE8WH JGwC66CQlvn859rQLIIGacdet4g8fA8Oc6l43Xe391EQha2se1zNyeCUW69J2Xyy dZjG6xk5vGVUnFosXRAX8eCTeOpHDAc6B7rCfUY9dLGZegLfWp5LY0MCCIVxqe5t PPVs96WhUEeI9wgugc6g/Q= Received: from asus-laptop (unknown [27.38.249.43]) by smtp5 (Coremail) with SMTP id HdxpCgBHjQWu4BVjTLgCaA--.9708S2; Mon, 05 Sep 2022 19:42:39 +0800 (CST) References: <86wnen5vl3.fsf@163.com> <616e9ef4c4c7820ba7c1ceaff559b1a7b785a05f.camel@telenet.be> User-agent: mu4e 1.8.9; emacs 29.0.50 From: Zhu Zihao Date: Mon, 05 Sep 2022 19:41:52 +0800 In-reply-to: <616e9ef4c4c7820ba7c1ceaff559b1a7b785a05f.camel@telenet.be> Message-ID: <86o7vut5ck.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HdxpCgBHjQWu4BVjTLgCaA--.9708S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RyHq4UUUUU X-Originating-IP: [27.38.249.43] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaw9zr1et6Y+FXQAAs8 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=1662379792; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=Etxq1GPNcVuepKNFXPYm6LauC7xQb8fxbBV7nLyN+xk=; b=AiMlzFvkEPonUNB2X8h49QZGnfffwSkCIucxsd/jRuCIM3GUnuLDdL5HsZOL2M61UeR+pa QePedH2y1euYc819QWxYk99dV97seVtK5TpyKQry+ZsLeVHZE4yaftODtXtMQ5N6HHsP8P IHOyTdfy/E304OIlSkEVH6MO6SUsrR/3dtIFWubLzcNtRO+xVuNJLzu3j+uNoNnsp+CHIa J9PlQy5bGDuh6F93OIBNBivMAaBIKECNvBlX44u4GUa8znAADqeBs7Gj3CATjPNksgeupe 5ep9dtvPLRiPk6kS2bBMtuUp7aEYVhongoK4Ox2eAJhhiEQatjUVoaD+fOoIVg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662379792; a=rsa-sha256; cv=none; b=tWcMCN6Mt5LwiV/Om+ElN0HpajC5uMqF/+CyI+XBrfXUFrbvlHaIqiDu++z9ojbpPFdXMc 6Q+mDdT3pfGYdZX349VJaOwzyWIrWoMjlzltgf10YglXbIfpeUVYkbf2aGdeZbdVuTR/kF M63tTFhmX9njvOW7w9lnHevssjVVogzBTLmCAHB9EZhHapLArb5QXN322MuayjeacCxkOH yGWOPAzPxT0tyu2XleQjg+W6AL+QJ0vm6E2SoMKKpmcsI0NeBRF8rUaY2/C8FJSru9YeC6 ME4O0l98j2hJgrtTLDzstzPmJgfKb31QSd8+B6YGuB5DQNtsElVfSHhbeX1a7g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=QtBuPPQa; 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: 5.63 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=QtBuPPQa; 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: B459B3779B X-Spam-Score: 5.63 X-Migadu-Scanner: scn1.migadu.com X-TUID: Gpscejm5g1kV --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha384; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Long time no see. I updated Mogan to 1.1.0 and switch the source to github. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iKsEARMJADMWIQQkZvBVi/S5Mr2eh+gobjKMmWV3qgUCYxXgqxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQKG4yjJlld6rrmQF+JGHpW3OTVDCLinXPadUW9S3HNcQj vb47yqMWFOzThyZbNpL4oRsEFQijSS6mft2TAYDyUUknKSRvUmIotOiodJGpFr4d ukuQOuwnHdsxer/Tto99+UxD7YXbEJIcnQK35CE= =ZVu8 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-texmacs-Use-G-expression.patch >From f754c24c0945dd2fc17881f37598262b612eee67 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 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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Add-mogan.patch >From bf3c22e5f835725fd700176f0d1b1ec0ac28fe51 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 | 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 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744 Zihao --=-=-=--