bug#51500: closed ([PATCH] gnu: Add kiwix-tools)

[GNU bug Tracking System]

Your message dated Tue, 7 Dec 2021 17:29:28 -0500
with message-id <Ya/gSDq0sVsmMHMl@jasmine.lan>
and subject line Re: [bug#51500] [PATCH] gnu: Add kiwix-tools
has caused the debbugs.gnu.org bug report #51500,
regarding [PATCH] gnu: Add kiwix-tools
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
51500: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=51500
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: Add kiwix-tools
>
>
>
>
> Date: 
>
> Sat, 30 Oct 2021 07:36:31 +0200
>
>
>
>
> * gnu/packages/web.scm (kiwix-tools): New variable.
>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
> ---
>  gnu/packages/web.scm | 38 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index d7df3079b3..c775610634 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -8124,6 +8124,44 @@ (define-public kiwix-desktop
>  offline (such as Wikipedia), without any access to Internet.")
>      (license license:gpl3)))
>  
> +(define-public kiwix-tools
> +  (package
> +    (name "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"))
> +              (sha256
> +               (base32
> +                "1npf9ddhpkmx97gxmvmwmi8a69md8kh2szimd9rpg6ggd4big03a"))))
> +    (build-system meson-build-system)
> +    (inputs
> +     `(("curl" ,curl)
> +       ("icu4c" ,icu4c)
> +       ("kiwix-lib" ,kiwix-lib)
> +       ("libmicrohttpd" ,libmicrohttpd)
> +       ("libzim" ,libzim)
> +       ("pugixml" ,pugixml)
> +       ("xapian" ,xapian)
> +       ("zlib" ,zlib)
> +       ("zstd" ,zstd "lib")))
> +    (native-inputs
> +     `(("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
> +tools:
> +@itemize
> +@item kiwix-manage: Manage XML based library of ZIM files
> +@item kiwix-read: Read ZIM file content
> +@item kiwix-search: Fulltext search in ZIM files
> +@item kiwix-serve: HTTP daemon serving ZIM files
> +@end itemize\n")
> +    (license license:gpl3)))
> +
>  (define-public uriparser
>    (let ((commit "25dddb16cf044a7df27884e7ad3911baaaca3d7c")
>          (revision "1"))
> -- 
> 2.33.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#51500] [PATCH] gnu: Add kiwix-tools
>
>
>
>
> Date: 
>
> Tue, 7 Dec 2021 17:29:28 -0500
>
>
>
>
> 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")
> ------
>
>
> --- End Message ---