GNU bug report logs -
#48899
[PATCH]: gnu: Add lowdown.
Previous Next
Reported by: Zhu Zihao <all_but_last <at> 163.com>
Date: Mon, 7 Jun 2021 12:24:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48899 in the body.
You can then email your comments to 48899 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#48899
; Package
guix-patches
.
(Mon, 07 Jun 2021 12:24:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Zhu Zihao <all_but_last <at> 163.com>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Mon, 07 Jun 2021 12:24:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
--
Retrieve my PGP public key:
gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F
Zihao
[signature.asc (application/pgp-signature, inline)]
[0001-gnu-Add-lowdown.patch (text/x-patch, inline)]
From 15feae91f6192f22d519968c9849de512eaaf525 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#48899
; Package
guix-patches
.
(Tue, 06 Jul 2021 03:06:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 48899 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
ping.
--
Retrieve my PGP public key:
gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F
Zihao
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org
:
bug#48899
; Package
guix-patches
.
(Fri, 05 Nov 2021 05:50:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 48899 <at> debbugs.gnu.org (full text, mbox):
Hi Zhu,
thanks for the patch. However, your patch was missing some imports as well as in the meantime a new version was released.
I also created one more patch to add prefix to all licenses in this module.
Petr
----8<--------cut here ------------------>8------------
* gnu/packages/markup.scm (lowdown): New variable.
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index 368976bfde..720bdb178b 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -7,6 +7,8 @@
;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
;;; Copyright © 2020 EuAndreh <eu <at> euandre.org>
;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
+;;; Copyright © 2021 Zhu Zihao <all_but_last <at> 163.com>
+;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -34,12 +36,14 @@ (define-module (gnu packages markup)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix utils)
+ #:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module ((guix licenses) #:prefix license:))
(define-public hoedown
(package
@@ -114,6 +118,36 @@ (define-public markdown
(license (non-copyleft "file://License.text"
"See License.text in the distribution."))))
+(define-public lowdown
+ (package
+ (name "lowdown")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "2f6lpyz5bbvwqadal8xcfjcm46zcycrgk5079isjyipg85zdyvb2"))))
+ (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.33.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#48899
; Package
guix-patches
.
(Fri, 05 Nov 2021 05:51:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 48899 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/markup.scm (hoedown, markdown, discount,
perl-text-markdown-discount, cmark, smu, md4c, python-mistletoe)
[license]: Add prefix license:.
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)))
--
2.33.1
Information forwarded
to
guix-patches <at> gnu.org
:
bug#48899
; Package
guix-patches
.
(Fri, 05 Nov 2021 20:40:01 GMT)
Full text and
rfc822 format available.
Message #17 received at 48899 <at> debbugs.gnu.org (full text, mbox):
Hi Petr,
Am Freitag, den 05.11.2021, 05:48 +0000 schrieb phodina:
> Hi Zhu,
>
> thanks for the patch. However, your patch was missing some imports as
> well as in the meantime a new version was released.
>
> I also created one more patch to add prefix to all licenses in this
> module.
>
> Petr
>
> ----8<--------cut here ------------------>8------------
This blurb should go below the changelog...
> * gnu/packages/markup.scm (lowdown): New variable.
>
Here after two dashes ("--")
> diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
> index 368976bfde..720bdb178b 100644
> --- a/gnu/packages/markup.scm
> +++ b/gnu/packages/markup.scm
> @@ -7,6 +7,8 @@
> ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
> ;;; Copyright © 2020 EuAndreh <eu <at> euandre.org>
> ;;; Copyright © 2021 Noisytoot <noisytoot <at> disroot.org>
> +;;; Copyright © 2021 Zhu Zihao <all_but_last <at> 163.com>
> +;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -34,12 +36,14 @@ (define-module (gnu packages markup)
> #:use-module (guix build-system perl)
> #:use-module (guix build-system python)
> #:use-module (guix utils)
> + #:use-module (gnu packages base)
> #:use-module (gnu packages compression)
> #:use-module (gnu packages)
> #:use-module (gnu packages perl)
> #:use-module (gnu packages pkg-config)
> #:use-module (gnu packages python)
> - #:use-module (gnu packages web))
> + #:use-module (gnu packages web)
> + #:use-module ((guix licenses) #:prefix license:))
>
> (define-public hoedown
> (package
> @@ -114,6 +118,36 @@ (define-public markdown
> (license (non-copyleft "file://License.text"
> "See License.text in the
> distribution."))))
>
> +(define-public lowdown
> + (package
> + (name "lowdown")
> + (version "0.10.0")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append "
> https://kristaps.bsd.lv/lowdown/snapshots/lowdown-"
> + version ".tar.gz"))
> + (sha256
> + (base32
> "2f6lpyz5bbvwqadal8xcfjcm46zcycrgk5079isjyipg85zdyvb2"))))
Please provide a proper hash next time you update the version on
someone's behalf.
> + (build-system gnu-build-system)
> + (arguments
> + `(#:tests? #f ;No test
There are actually regress tests.
> + #: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)))
> +
Cheers
Reply sent
to
Liliana Marie Prikler <liliana.prikler <at> gmail.com>
:
You have taken responsibility.
(Fri, 05 Nov 2021 20:43:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Zhu Zihao <all_but_last <at> 163.com>
:
bug acknowledged by developer.
(Fri, 05 Nov 2021 20:43:02 GMT)
Full text and
rfc822 format available.
Message #22 received at 48899-done <at> debbugs.gnu.org (full text, mbox):
Hi Petr,
Am Freitag, den 05.11.2021, 05:49 +0000 schrieb phodina:
> * gnu/packages/markup.scm (hoedown, markdown, discount,
> perl-text-markdown-discount, cmark, smu, md4c, python-mistletoe)
> [license]: Add prefix license:.
Pushed with slight changes to commit message and ChangeLog, as well as
> @@ -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."))))
indented this hunk.
Also added the license use statement where the previous one was and
deleted the previous to enforce use of license:
Thanks
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sat, 04 Dec 2021 12:24:08 GMT)
Full text and
rfc822 format available.
This bug report was last modified 2 years and 143 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.