From patchwork Fri Nov 5 05:48:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34255 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 C04BF27BBE1; Fri, 5 Nov 2021 05:50:12 +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 6E90F27BBE3 for ; Fri, 5 Nov 2021 05:50:11 +0000 (GMT) Received: from localhost ([::1]:48400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mis78-00039j-CU for patchwork@mira.cbaines.net; Fri, 05 Nov 2021 01:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mis70-00039b-9b for guix-patches@gnu.org; Fri, 05 Nov 2021 01:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mis70-0007Kw-0Y for guix-patches@gnu.org; Fri, 05 Nov 2021 01:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mis6z-0002OR-S9 for guix-patches@gnu.org; Fri, 05 Nov 2021 01:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48899] [PATCH v2 1/2] gnu: Add lowdown. 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:50:01 +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.16360913539132 (code B ref 48899); Fri, 05 Nov 2021 05:50:01 +0000 Received: (at 48899) by debbugs.gnu.org; 5 Nov 2021 05:49:13 +0000 Received: from localhost ([127.0.0.1]:44410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mis6C-0002NE-QS for submit@debbugs.gnu.org; Fri, 05 Nov 2021 01:49:13 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:37483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mis6A-0002My-FA for 48899@debbugs.gnu.org; Fri, 05 Nov 2021 01:49:11 -0400 Date: Fri, 05 Nov 2021 05:48:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636091343; bh=fesjivKBtupNkbz2/+lDI9SlXoJ+XzVNVHuyxPE8Ucc=; h=Date:To:From:Reply-To:Subject:From; b=vIzEuK2eiwxrfqq5XutABHkIZPW4BFAz5lY3UPgcHFlAyvlcY7SzkSSBt8XGQh7zk 5jGagwOxMaCJjLFthlwJRqAay+zg00clztdJCaeGQNBahP0AanUaYlToVEwAz/O3q9 fh6d/35AdrDxdnNZRHsIJSTpilqgsmNJHKGt2/8I= 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 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. --- 2.33.1 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 ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021 Noisytoot +;;; Copyright © 2021 Zhu Zihao +;;; Copyright © 2021 Petr Hodina ;;; ;;; 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")