From 44308c8c5fcf881a4d29ee0abc38b09fcbafb0b4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 9 Dec 2020 18:08:28 +0100 Subject: gnu: Add libzim. * gnu/packages/web.scm (libzim): New variable. --- gnu/packages/web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ff40743832..4e5595cb5c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -79,8 +79,10 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix build-system trivial) #:use-module (gnu packages) @@ -90,6 +92,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages bittorrent) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -111,6 +114,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnu-doc) + #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages gperf) @@ -118,6 +122,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages jemalloc) @@ -152,6 +157,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages re2c) #:use-module (gnu packages readline) + #:use-module (gnu packages search) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -7854,3 +7860,38 @@ solution for any project's interface needs: (description "gmnisrv is a simple Gemini protocol server written in C.") (license (list license:gpl3+ license:bsd-3))))) ;; for ini.c and ini.h + +(define-public libzim + (package + (name "libzim") + (version "6.2.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openzim/libzim") + (commit version))) + (sha256 + (base32 + "0p2317cp19lx0hw9n4fsb3nw2vc4hc1yyi98k3yrs41pkr840kwa")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) + (arguments + ;; TODO: Find out why tests fail. + '(#:tests? #f)) + (inputs + `(("icu4c" ,icu4c) + ("liblzma" ,xz) + ("libuuid" ,util-linux "lib") + ("xapian" ,xapian) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("googletest" ,googletest))) + (home-page "https://wiki.openzim.org/wiki/Main_Page") + (synopsis "Reference implementation of the ZIM specification") + (description "The openZIM project proposes offline storage solutions for +content coming from the Web. The zimlib is the standard implementation of the +ZIM specification. It is a library which implements the read and write method +for ZIM files.") + (license license:gpl2))) -- cgit v1.2.3 From acbf47a0676cad4d56801845047118e3fcd1c5f2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 9 Dec 2020 18:09:47 +0100 Subject: gnu: Add kiwix-lib. * gnu/packages/web.scm (kiwix-lib): New variable. --- gnu/packages/web.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4e5595cb5c..97bff39718 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7895,3 +7895,57 @@ content coming from the Web. The zimlib is the standard implementation of the ZIM specification. It is a library which implements the read and write method for ZIM files.") (license license:gpl2))) + +(define-public kiwix-lib + (package + (name "kiwix-lib") + (version "9.4.0") + (home-page "https://github.com/kiwix/kiwix-lib/") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (sha256 + (base32 + "0nsm4qgl0cb6wv983n0px1kf217k4kykb8q56b8j6ikp061lzamm")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-paths-and-includes + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPPFLAGS" (string-append "-I" (assoc-ref inputs "mustache"))) + (substitute* "src/aria2.cpp" + (("ARIA2_CMD \"aria2c\"") + (string-append "ARIA2_CMD \"" + (assoc-ref inputs "aria2") + "/bin/aria2c\""))) + #t))))) + (inputs + `(("aria2" ,aria2) + ("curl" ,curl) + ("icu4c" ,icu4c) + ("libmicrohttpd" ,libmicrohttpd) + ("libzim" ,libzim) + ("pugixml" ,pugixml) + ("xapian" ,xapian) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) + (native-inputs + `(("mustache" ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kainjow/Mustache") + ;; XXX: Readme says to use version 3. Can we use 3.2.1? + (commit "v4.1"))) + (file-name (git-file-name "mustache" "4.1")) + (sha256 + (base32 + "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb")))) + ("pkg-config" ,pkg-config))) + (synopsis "Common code base for all Kiwix ports") + (description "The Kiwix library provides the Kiwix software suite core. +It contains the code shared by all Kiwix ports.") + (license license:gpl3))) -- cgit v1.2.3 From 5f6a0019339d8ee06a3f0a9bbb5df672179fe57a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 9 Dec 2020 18:20:26 +0100 Subject: gnu: Add kiwix-desktop. * gnu/packages/web.scm (kiwix-desktop): New variable. --- gnu/packages/web.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 97bff39718..6be6011c4e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7949,3 +7949,59 @@ for ZIM files.") (description "The Kiwix library provides the Kiwix software suite core. It contains the code shared by all Kiwix ports.") (license license:gpl3))) + +(define-public kiwix-desktop + (package + (name "kiwix-desktop") + (version "2.0.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://download.kiwix.org/release/kiwix-desktop/kiwix-desktop-" + version + ".tar.gz")) + (sha256 + (base32 + "1a9h4qmh6fkfscyp6lax0ri07dvvzw2wp4kr1sm86n0bdk3cwwha")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (invoke "qmake" + (string-append "PREFIX=" + (assoc-ref outputs "out"))))) + (add-before 'configrue 'enable-print-support + (lambda _ + (substitute* "kiwix-desktop.pro" + (("webenginewidgets") "webenginewidgets printsupport")) + #t)) + (add-before 'configure 'substitute-source + ;; Looks like .pro file is missing a feature. + ;; See https://github.com/kiwix/kiwix-desktop/issues/556. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "kiwix-desktop.pro" + (("webenginewidgets" all) (string-append all " printsupport"))) + #t))))) + (inputs + `(("curl" ,curl) + ("icu4c" ,icu4c) + ("kiwix-lib" ,kiwix-lib) + ("libzim" ,libzim) + ("pugixml" ,pugixml) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("xapian" ,xapian) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qmake" ,qtbase))) + (home-page "https://wiki.kiwix.org/wiki/Software") + (synopsis "Viewer and manager of ZIM files") + (description "Kiwix Desktop allows you to enjoy a lot of different content +offline (such as Wikipedia), without any access to Internet.") + (license license:gpl3))) -- cgit v1.2.3 From 73817f711baf5c26f10690b6df4d802b3434f70d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Dec 2020 00:56:24 +0100 Subject: gnu: qoauth: Fix wrong URL in comment. * gnu/packages/web.scm (qoauth)[arguments]: Adjust comment. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6be6011c4e..82d5df3a75 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1082,7 +1082,7 @@ instances, while JSON's objects will be mapped to @code{QVariantMap}.") (lambda* (#:key outputs #:allow-other-keys) (substitute* "src/src.pro" ;; Do not attempt to install the .prf file into qtbase - ;; "lib/mkspecs/features", ref . + ;; "lib/qt5/mkspecs/features", ref . (("\\$\\$\\[QMAKE_MKSPECS\\]") (string-append (assoc-ref outputs "out") "/lib/qt5/mkspecs"))) #t)) -- cgit v1.2.3 From eee3af86c74bd9f90e8888ad7a0180dc609eaa9d Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Fri, 11 Dec 2020 03:59:02 +0000 Subject: gnu: esbuild: Update to 0.8.21. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (esbuild): Update to 0.8.21. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 82d5df3a75..f26b114d1a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1485,7 +1485,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.19") + (version "0.8.21") (source (origin (method git-fetch) @@ -1494,7 +1494,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19y4g0wjkvrqzl4ngnlkb1giqjyx35gwz4zfk8pw4szsy85z6mli")) + (base32 "1gkh3ka7gfdqvzymj6vh9w2d0cp7n2vih42y7ghg7y8x6ry4c6mi")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3