From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MBujEX7gr2GjXQEAgWs5BA (envelope-from ) for ; Tue, 07 Dec 2021 23:30:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sEFCDX7gr2E0AwAAB5/wlQ (envelope-from ) for ; Tue, 07 Dec 2021 22:30:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 71D1117C7D for ; Tue, 7 Dec 2021 23:30:21 +0100 (CET) Received: from localhost ([::1]:40966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muiya-0003b7-1i for larch@yhetil.org; Tue, 07 Dec 2021 17:30:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muiyJ-0003Ut-EM for guix-patches@gnu.org; Tue, 07 Dec 2021 17:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muiyI-0001F1-W4 for guix-patches@gnu.org; Tue, 07 Dec 2021 17:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1muiyI-0001V9-O1 for guix-patches@gnu.org; Tue, 07 Dec 2021 17:30:02 -0500 Subject: bug#51500: [PATCH] gnu: Add kiwix-tools Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 07 Dec 2021 22:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 51500 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Denis 'GNUtoo' Carikli Cc: 51500-done@debbugs.gnu.org Mail-Followup-To: 51500@debbugs.gnu.org, leo@famulari.name, GNUtoo@cyberdimension.org Received: via spool by 51500-done@debbugs.gnu.org id=D51500.16389161805705 (code D ref 51500); Tue, 07 Dec 2021 22:30:02 +0000 Received: (at 51500-done) by debbugs.gnu.org; 7 Dec 2021 22:29:40 +0000 Received: from localhost ([127.0.0.1]:38921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muixw-0001Tu-0Q for submit@debbugs.gnu.org; Tue, 07 Dec 2021 17:29:40 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:52535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muixs-0001Tg-Cm for 51500-done@debbugs.gnu.org; Tue, 07 Dec 2021 17:29:39 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E93E05C0F0F; Tue, 7 Dec 2021 17:29:30 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 07 Dec 2021 17:29:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=0wtRQvHU+FXsV8H92fiGZy7n qRKBq3DUwm69QNZpFeE=; b=xEJWri/KDao4Fo9t8Uq7ADofydJEMxl3FNJ3y8Mb ZvU7xyb9v9KMOqhbjEMUNxmW0PMZ6HNgCUET0fjG13O/LwPXO82dkzwzbKWgwjNo Jz6fsTRYcmQ30Czp5l14Zkaif2H+Yt1x2b9h7XZvUTuaFAfz40SywBc1N4bFBHHJ Nhg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=0wtRQv HU+FXsV8H92fiGZy7nqRKBq3DUwm69QNZpFeE=; b=hKqQiBdbIoThUjjpqja008 mGR0yDRObUpH0ntjFEWY5VyOZb5CPHMswAjlrVh127EpKg0MnZM8HxmA+S/5g50m gadvBqe8U3EsMywUP3rajrDUpmAUxajSYyNYefm0u1Nh7lHyo5lBgLkhixSPARG5 txG/IrHRWtsJHwgSbyYPIt+EHqXnFhm39kbmSTjhYKSfA+UxzSU6i9rKrfp0ie6m O5sxmLEbyKFTYJsYURX5Ud/O9ejLO84MW+UvGY1K9R+jdGJdasuIJFEa3SFeni+2 uDfqB9PvBSqcMi6sMGtUJ2yEQ0uhM07uw8jjFKl9TNcNU6F8hY6blras0EOY8u5w == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrjeehgdduieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeehfeehgfffvefffeekueffffeivefguefgjeeigfejhefggffhlefgheeitdeu leenucffohhmrghinhepkhhifihigidrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 7 Dec 2021 17:29:30 -0500 (EST) Date: Tue, 7 Dec 2021 17:29:28 -0500 From: Leo Famulari Message-ID: References: <20211030053631.31209-1-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211030053631.31209-1-GNUtoo@cyberdimension.org> 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638916221; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=0wtRQvHU+FXsV8H92fiGZy7nqRKBq3DUwm69QNZpFeE=; b=oGqtE2JjMFuQDzHlIsVlYfTnMBXnsq8XmBWAG2kxyg/dDGj0dxZoSkO4hkeSbBS+vggT9C nRDLnwGEVP6vyzTdUHkLh+O3UGNvTPf23y6OtRDz4hAakRkL/lC61TMwWeIcEoUy/I2+rH n4pZ2sai+7PhS8YwOxOYNyzQe7/sDrsV0R8SxDaTfnN7ITZPQkpxW11QPFEKIDbDQPADfT cHd9LNa+mW4zX6gmR3PqYNHt3otCcbiMDbrPEOJnAd7tEDItsfyf7rBK3tPgRhFk1E+XHR Tojt212PNkY1xFyrKk5FrjCjHfZNaNorFaRrsX7QKh1hfdElyUzXCOiaRJG0xw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638916221; a=rsa-sha256; cv=none; b=P1mUEDbozAoomhfpbfCh2rGJTjgQ4OH7/b3ByVlxEKh6qikahT5p/ISw+pC2wCiwfnZrqS Prp8MjFtpXHHAGmyrpURFILcbECF34i1fqRhi8UpatMyRr/3qdm25Sf9q4qiiV5wsXxQk6 JWk9JF10Vf7WQ44W7FbL0NjNNS0Ltep6t6AXeF8v8ELCxrYNx5C3ZobAgOCDtCgUjTQHKl QnF1Pz6mOOesHn0NxFNQeNKU+BxmffqdMFNAqrVYaSg2vulwf6lkkYEVnAQomdw5eRN4sX FrgoKXWSz8jBLcU7d9oAPSkt3C9p6eXC2lZKQIkaPZ2XIVu1BI5phtV0Ochy0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b="xEJWri/K"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=hKqQiBdb; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b="xEJWri/K"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=hKqQiBdb; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 71D1117C7D X-Spam-Score: -4.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: v3eystpJRSur On Sat, Oct 30, 2021 at 07:36:31AM +0200, Denis 'GNUtoo' Carikli wrote: > * gnu/packages/web.scm (kiwix-tools): New variable. Thanks for the patch! I pushed as 9e67f2ad418e9a5a7a83dc2349624572e9dbfc8b with minor changes, shown below. > + (license license:gpl3))) I also changed the license to 'gpl3+', because the source files include the phrase "either version 3 of the License, or any later version", and README.md confirms that the authors intend to allow licensing under later GPL revisions. And I added you to the list of authors of 'gnu/packages/web.scm'. ------ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 05cbf4d8cc..2f2ed4d8d2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8133,10 +8133,8 @@ (define-public kiwix-tools (version "3.1.2") (source (origin (method url-fetch) - (uri (string-append - "https://download.kiwix.org/release/kiwix-tools/kiwix-tools-" - version - ".tar.xz")) + (uri (string-append "https://download.kiwix.org/release/" + "kiwix-tools/kiwix-tools-" version ".tar.xz")) (sha256 (base32 "1npf9ddhpkmx97gxmvmwmi8a69md8kh2szimd9rpg6ggd4big03a")))) @@ -8155,7 +8153,7 @@ (define-public kiwix-tools `(("pkg-config" ,pkg-config))) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Kiwix command line tools") - (description "The Kiwix tools is a collection of Kiwix related command line + (description "The Kiwix tools are a collection of Kiwix-related command line tools: @itemize @item kiwix-manage: Manage XML based library of ZIM files @@ -8163,7 +8161,7 @@ (define-public kiwix-tools @item kiwix-search: Fulltext search in ZIM files @item kiwix-serve: HTTP daemon serving ZIM files @end itemize\n") - (license license:gpl3))) + (license license:gpl3+))) (define-public uriparser (let ((commit "25dddb16cf044a7df27884e7ad3911baaaca3d7c") ------