From patchwork Thu Mar 16 21:24:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 48056 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 3B40616E85; Thu, 16 Mar 2023 21:25:20 +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=ham 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 CE08E16CBF for ; Thu, 16 Mar 2023 21:25:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcv5s-00070L-IQ; Thu, 16 Mar 2023 17:25: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 1pcv5r-000703-3Z for guix-patches@gnu.org; Thu, 16 Mar 2023 17:25:03 -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 1pcv5q-000845-On for guix-patches@gnu.org; Thu, 16 Mar 2023 17:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcv5q-000709-Hs for guix-patches@gnu.org; Thu, 16 Mar 2023 17:25:02 -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: Thu, 16 Mar 2023 21:25:02 +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.167900189126876 (code B ref 62228); Thu, 16 Mar 2023 21:25:02 +0000 Received: (at 62228) by debbugs.gnu.org; 16 Mar 2023 21:24:51 +0000 Received: from localhost ([127.0.0.1]:43208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcv5f-0006zO-Aq for submit@debbugs.gnu.org; Thu, 16 Mar 2023 17:24:51 -0400 Received: from mail-ed1-f42.google.com ([209.85.208.42]:36431) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcv5d-0006yw-6z for 62228@debbugs.gnu.org; Thu, 16 Mar 2023 17:24:50 -0400 Received: by mail-ed1-f42.google.com with SMTP id w9so13101432edc.3 for <62228@debbugs.gnu.org>; Thu, 16 Mar 2023 14:24:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1679001883; 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=dmGOQnDloB/MuaKKBrZIsiNRAjeeMMXTuv0EHhJ2OW6k4M4Cw+XdbUTXDL4m4NoNH2 Ljv3ivWZFgSEHTWBWx59nYrUMiol9ivA0J1pqNdFhB37/DX2ADJn1R7GbkKC3zkOhM+D zdJs1bXje9LMUPeM4BQ1tjyBovoT7ceWRvQBg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679001883; 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=q8bKGxLuRsTDeR8erB+K3UfhVSJ4Rhv58t+ISAexJ2JktNjkfXDmEvo8e3ZWqiyZWa wQg2RlnVZ2lGPbZuPudZMbHQB9akpmyC8zk27gdubt3TPOondWgOcPMQ4KxBmLHV9LAK W2fIKwlnmZmVfadUsOLB+9bDi4gteEzYtFOVVwdIvdS8qWUrVHkS3fLnRxOMWBlYMcz4 Aa6Za22irQzdJwYMG7uucTm3CvRtYEzziD4/p/4qYRXss4eOeMvekGgjKZW7ubnE0ouI f14MzUf2A608XE2WjJR/2Iqu8VMKjM50wp+F8Beyxb/Hk9sEHN60p3Bl+h30ikNacnr1 jY0Q== X-Gm-Message-State: AO0yUKXiDG430LabxBQs3DUJuHOkk3oY2YQd+JByO8jDQPb/nAcFuqhR 8ggwDeUYr4fFv6LToRrHUoNTiK5rMaFPqHZUFQw= X-Google-Smtp-Source: AK7set8E35z69n2G4wR2z3eH5+KlozNwY+SppoGcffxO5JtQEtPna9sYI3UhWzPWfNFKSAqUSll/WA== X-Received: by 2002:a17:906:a84f:b0:91f:b13f:a028 with SMTP id dx15-20020a170906a84f00b0091fb13fa028mr10809168ejb.34.1679001882868; Thu, 16 Mar 2023 14:24:42 -0700 (PDT) Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id wr5-20020a170907700500b008b133f9b33dsm100164ejb.169.2023.03.16.14.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:24:42 -0700 (PDT) From: Sergey Trofimov Date: Thu, 16 Mar 2023 22:24:58 +0100 Message-Id: <20230316212458.6187-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+))))