From patchwork Mon Jun 7 12:22:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 30004 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 849E527BC83; Mon, 7 Jun 2021 13:24:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0225D27BC81 for ; Mon, 7 Jun 2021 13:24:11 +0100 (BST) Received: from localhost ([::1]:59754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqEIc-0002rr-3q for patchwork@mira.cbaines.net; Mon, 07 Jun 2021 08:24:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqEIU-0002rT-NX for guix-patches@gnu.org; Mon, 07 Jun 2021 08:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqEIU-0003dj-HH for guix-patches@gnu.org; Mon, 07 Jun 2021 08:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqEIU-0005zJ-Dv for guix-patches@gnu.org; Mon, 07 Jun 2021 08:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48899] [PATCH]: gnu: Add lowdown. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 12:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48899@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162306859022954 (code B ref -1); Mon, 07 Jun 2021 12:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jun 2021 12:23:10 +0000 Received: from localhost ([127.0.0.1]:54689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqEHe-0005y9-7Q for submit@debbugs.gnu.org; Mon, 07 Jun 2021 08:23:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:47064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqEHc-0005y2-Bb for submit@debbugs.gnu.org; Mon, 07 Jun 2021 08:23:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqEHa-0002gc-Ve for guix-patches@gnu.org; Mon, 07 Jun 2021 08:23:08 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:45556) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqEHV-0002zE-Il for guix-patches@gnu.org; Mon, 07 Jun 2021 08:23:06 -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=9Tak6 KV5wWNu/MkwDkFrzA/vpGxeNf+iXr0jl+n8hj8=; b=In2EJcOInXi0c5NwW6BzV lka3Z/RCUaZTPqTyXzlIC1PZ69YDZRoKJmgjDcJfjOaVFCtso5nbN0zJWaGBuVhV CZWmGEIJ1ANaXF9NeDEiMH5UXK4W6Hn7MNm8PbjukbSe7aZzZkCgx2JTwDgEIFcU ucE5+IAHU8g/qd8IjpHTE8= Received: from asus-laptop (unknown [27.38.241.30]) by smtp5 (Coremail) with SMTP id HdxpCgBHX+qdD75gT0qmGw--.21475S2; Mon, 07 Jun 2021 20:22:54 +0800 (CST) User-agent: mu4e 1.4.15; emacs 27.2 From: Zhu Zihao Date: Mon, 07 Jun 2021 20:22:52 +0800 Message-ID: <86czsxamoz.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HdxpCgBHX+qdD75gT0qmGw--.21475S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUwxRDUUUUU X-Originating-IP: [27.38.241.30] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZhmqr1aD8LU6LgABs- Received-SPF: pass client-ip=123.126.97.5; envelope-from=all_but_last@163.com; helo=mail-m975.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, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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" X-getmail-retrieved-from-mailbox: Patches From 15feae91f6192f22d519968c9849de512eaaf525 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 7 Jun 2021 20:17:22 +0800 Subject: [PATCH] gnu: Add lowdown. * gnu/packages/markup.scm(lowdown): New variable. --- gnu/packages/markup.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 368976bfde..0a643809aa 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -114,6 +114,36 @@ convert it to structurally valid XHTML (or HTML).") (license (non-copyleft "file://License.text" "See License.text in the distribution.")))) +(define-public lowdown + (package + (name "lowdown") + (version "0.8.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-" + version ".tar.gz")) + (sha256 + (base32 "1f6lpyz5bbvwqadal8xcfjcm46zcycrgk5079isjyipg85zdyvb2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;No test + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=" out) + (string-append "MANDIR=" out "/share/man")))))))) + (native-inputs + `(("which" ,which))) + (home-page "https://kristaps.bsd.lv/lowdown") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, +roff documents in the ms and man formats, LaTeX, gemini, and terminal output.") + (license license:isc))) + (define-public discount (package (name "discount") -- 2.31.1 From patchwork Fri Nov 5 05:49:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34256 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 8856727BBE3; Fri, 5 Nov 2021 05:51:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2463327BBE1 for ; Fri, 5 Nov 2021 05:51:11 +0000 (GMT) Received: from localhost ([::1]:48654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mis86-0003Qg-As for patchwork@mira.cbaines.net; Fri, 05 Nov 2021 01:51:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mis7y-0003Pv-QD for guix-patches@gnu.org; Fri, 05 Nov 2021 01:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mis7y-0007ZN-Hg for guix-patches@gnu.org; Fri, 05 Nov 2021 01:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mis7y-0002QJ-GF for guix-patches@gnu.org; Fri, 05 Nov 2021 01:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48899] [PATCH v2 2/2] gnu: Update license. References: <86czsxamoz.fsf@163.com> In-Reply-To: <86czsxamoz.fsf@163.com> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Nov 2021 05:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "48899@debbugs.gnu.org" <48899@debbugs.gnu.org> Received: via spool by 48899-submit@debbugs.gnu.org id=B48899.16360914089242 (code B ref 48899); Fri, 05 Nov 2021 05:51:02 +0000 Received: (at 48899) by debbugs.gnu.org; 5 Nov 2021 05:50:08 +0000 Received: from localhost ([127.0.0.1]:44414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mis76-0002P0-6K for submit@debbugs.gnu.org; Fri, 05 Nov 2021 01:50:08 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:44869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mis74-0002OE-Bn for 48899@debbugs.gnu.org; Fri, 05 Nov 2021 01:50:06 -0400 Date: Fri, 05 Nov 2021 05:49:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636091400; bh=Os0/yLEhMFbMYO05QMvjQkuSzn3Zm50wcUUwGe7VjDU=; h=Date:To:From:Reply-To:Subject:From; b=BBOodk7UtpAr+B/LtZXriCZnxfzXs/V/kMtW5LBX2ERDX6dmihmASXliHiZQZlwQT vJli4CFxhgdydFkYnSvguh5EX/K+pxSjUPRN6e74ARyCn/icutbU1t9T2N8z9vBhcC DWYlLBE13rHOoJ2/lfyWvg+dRFlt3K7mnUV6C3p0= Message-ID: MIME-Version: 1.0 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches * gnu/packages/markup.scm (hoedown, markdown, discount, perl-text-markdown-discount, cmark, smu, md4c, python-mistletoe) [license]: Add prefix license:. --- 2.33.1 diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 720bdb178b..91aa7b8fa0 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -71,7 +71,7 @@ (define-public hoedown (description "Hoedown is a standards compliant, fast, secure markdown processing library written in C.") (home-page "https://github.com/hoedown/hoedown") - (license expat))) + (license license:expat))) (define-public markdown (package @@ -115,7 +115,7 @@ (define-public markdown "Markdown is a text-to-HTML conversion tool for web writers. It allows you to write using an easy-to-read, easy-to-write plain text format, then convert it to structurally valid XHTML (or HTML).") - (license (non-copyleft "file://License.text" + (license (license:non-copyleft "file://License.text" "See License.text in the distribution.")))) (define-public lowdown @@ -192,7 +192,7 @@ (define-public discount "Discount is a markdown implementation, written in C. It provides a @command{markdown} command, and a library.") (home-page "https://www.pell.portland.or.us/~orc/Code/discount/") - (license bsd-3))) + (license license:bsd-3))) (define-public perl-text-markdown-discount (package @@ -237,7 +237,7 @@ (define-public perl-text-markdown-discount use Text::Markdown::Discount; my $html = markdown($text) @end example") - (license perl-license))) + (license license:perl-license))) (define-public cmark (package @@ -277,7 +277,7 @@ (define-public cmark ;; cmark is distributed with a BSD-2 license, but some components are Expat ;; licensed. The CommonMark specification is Creative Commons CC-BY-SA 4.0 ;; licensed. See 'COPYING' in the source distribution for more information. - (license (list bsd-2 expat cc-by-sa4.0)))) + (license (list license:bsd-2 license:expat license:cc-by-sa4.0)))) (define-public smu (package @@ -313,7 +313,7 @@ (define-public smu Smu was started as a rewrite of Markdown but became something more lightweight and consistent. The biggest difference between Markdown and smu is that smu doesn't support reference style links.") - (license x11))) + (license license:x11))) (define-public md4c (package @@ -335,7 +335,7 @@ (define-public md4c (description "MD4C is a C Markdown parser with a SAX-like interface. It is compliant to the CommonMark specification, with a few extensions.") - (license expat))) + (license license:expat))) (define-public python-mistletoe (package @@ -357,4 +357,4 @@ (define-public python-mistletoe Parsing Markdown into an abstract syntax tree also allows @code{mistletoe} to swap out renderers for different output formats, without touching any of the core components.") - (license expat))) + (license license:expat)))