From patchwork Thu Mar 16 21:24:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 48074 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 59C5216ECA; Fri, 17 Mar 2023 17:57:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF64116EC7 for ; Fri, 17 Mar 2023 17:57:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdEK8-00011e-IB; Fri, 17 Mar 2023 13:57:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pdEK6-0000zw-5i for guix-patches@gnu.org; Fri, 17 Mar 2023 13:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdEK5-0003bc-Tv for guix-patches@gnu.org; Fri, 17 Mar 2023 13:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pdEK5-0001rM-L2 for guix-patches@gnu.org; Fri, 17 Mar 2023 13:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62228] [PATCH 1/2] gnu: Add halibut. References: <20230316211925.5145-1-sarg@sarg.org.ru> In-Reply-To: <20230316211925.5145-1-sarg@sarg.org.ru> Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Mar 2023 17:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62228@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 62228-submit@debbugs.gnu.org id=B62228.16790757977113 (code B ref 62228); Fri, 17 Mar 2023 17:57:01 +0000 Received: (at 62228) by debbugs.gnu.org; 17 Mar 2023 17:56:37 +0000 Received: from localhost ([127.0.0.1]:45591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdEJh-0001qe-7v for submit@debbugs.gnu.org; Fri, 17 Mar 2023 13:56:37 -0400 Received: from mail-ed1-f41.google.com ([209.85.208.41]:38582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pdEJe-0001qQ-Mf for 62228@debbugs.gnu.org; Fri, 17 Mar 2023 13:56:35 -0400 Received: by mail-ed1-f41.google.com with SMTP id r11so23538722edd.5 for <62228@debbugs.gnu.org>; Fri, 17 Mar 2023 10:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1679075788; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0fBahF3i97sPOsiIJ2LjL0G1zDDQ9cZdg3C6pV0qwu8=; b=kxt553Br1coOENOwqzV/eBsvoaAgAc9sJcgksqT3hLhfBJAObIll4SEMGXeEVr0znG H6lE8vjl/kNUK3yVfLWal4drsPYAvV3/qcr2WDUNcDPBs6FevsglZxCly379jb1NNdq8 jiN3FRcchfZ4mmTAD1KHMIO2xBT/4nVTtJiQo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679075788; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0fBahF3i97sPOsiIJ2LjL0G1zDDQ9cZdg3C6pV0qwu8=; b=yiglHgsjfAO/vQ1Jc/F+rLfN5NJ5QZh4NxKIFzsJMF0h6t3PTaPkkfDMIzZrg0xF8u 9OPAv/dxZri/+iC6Ar+p924HouM2Yul6im8+5PmdwoMTFuyrYPs56F2A/34a7fI9FuOs kaRwhstS2iQen2A46dhocoIsFSVUgXTZATtGz0BdApY3BSZAV+2H2J+DKjwAXYkYTcjq 3yWgv0Hel2GBAPXSt3oBT8qy2fR7yNy0gHWOvexpWolzV6GBa0c44JJGpMGROzXrtrb6 +MISvwt8eklSDVIsm03/gHS/NM0+EKOuSEvW9/2HJ+nc9AKVRjLfTrMmBtBSLCYy8J+T g/0g== X-Gm-Message-State: AO0yUKV44jKmH54j/blHalsj3d9amlMdcTe6K4RoGpe7kohurhhILgaw er7lFalEeGSz8OHNvzITvlvrtoxXtRSD0VS9mIA= X-Google-Smtp-Source: AK7set+VataRoD0xKv1OCV1wI4CbJoVkSmKOeb+Cxu4iglM2q3pUc1omifhZTV7uKWOLe7+8Uks5tA== X-Received: by 2002:a17:906:fc0f:b0:878:7189:a457 with SMTP id ov15-20020a170906fc0f00b008787189a457mr197957ejb.51.1679075788271; Fri, 17 Mar 2023 10:56:28 -0700 (PDT) Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id s30-20020a50ab1e000000b004c5d1a15bd5sm1366419edc.69.2023.03.17.10.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 10:56:28 -0700 (PDT) From: Sergey Trofimov Date: Thu, 16 Mar 2023 22:24:24 +0100 Message-Id: <20230316212424.5998-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.2 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/documentation.scm (halibut): New variable. --- gnu/packages/documentation.scm | 44 +++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index a372e1a6ca..ed9851cc5f 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -29,7 +29,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages documentation) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) @@ -102,7 +102,7 @@ (define-public latex2html (description "LaTeX2HTML is a utility that converts LaTeX documents to web pages in HTML.") (home-page "https://www.latex2html.org/") - (license gpl2+))) + (license license:gpl2+))) (define-public asciidoc (package @@ -178,7 +178,7 @@ (define-public asciidoc AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user.") - (license gpl2+))) + (license license:gpl2+))) (define-deprecated asciidoc-py3 asciidoc) @@ -233,7 +233,33 @@ (define-public doxygen programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl, and to some extent D.") - (license gpl3+))) + (license license:gpl3+))) + +(define-public halibut + (package + (name "halibut") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-" + version "/halibut-" version ".tar.gz")) + (sha256 + (base32 "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a")))) + (build-system cmake-build-system) + (native-inputs (list pkg-config perl)) + (arguments + '(#:tests? #f)) ; No tests. + (home-page "https://www.chiark.greenend.org.uk/~sgtatham/halibut/") + (synopsis "Documentation production system for software manuals") + (description "This is yet another text formatting system, intended primarily for +writing software documentation. It accepts a single source format and outputs any or +all of text, HTML, Windows Help, man pages, GNU info, PostScript, or PDF. It has +comprehensive indexing and cross-referencing support, and generates hyperlinks within +output documents wherever possible. It supports Unicode, with the ability to fall +back to an alternative representation when Unicode output is not available.") + (license license:expat))) (define-public doc++ (package @@ -258,7 +284,7 @@ (define-public doc++ generate both TeX output for high-quality hardcopies or HTML output for online browsing. The documentation is extracted directly from the C/C++/IDL source or Java class files.") - (license gpl2+))) + (license license:gpl2+))) (define-public pod2pdf (package @@ -284,7 +310,7 @@ (define-public pod2pdf Documentation} format to PDF files. It also supports some extensions to the POD format, and supports the file types JPG, GIF, TIFF, PNG, and PNM for embedded objects.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public python-docrepr (package @@ -335,7 +361,7 @@ (define-public python-docrepr (description "Docrepr renders Python docstrings to HTML with Sphinx. It can generate rich and plain representations of docstrings, alongside additional metadata about the object to which the docstring belongs.") - (license bsd-3))) + (license license:bsd-3))) (define-public scrollkeeper (package @@ -368,7 +394,7 @@ (define-public scrollkeeper provides a simple API to allow help browsers to find, sort, and search the document catalog. It will also be able to communicate with catalog servers on the Net to search for documents which are not on the local system.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public zeal (let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c") @@ -416,4 +442,4 @@ (define-public zeal (synopsis "Offline documentation browser inspired by Dash") (description "Zeal is a simple offline documentation browser inspired by Dash.") - (license gpl3+)))) + (license license:gpl3+))))