[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: kiwix-lib: Update to 11.0.0.
From: |
guix-commits |
Subject: |
03/06: gnu: kiwix-lib: Update to 11.0.0. |
Date: |
Sat, 13 Aug 2022 08:05:32 -0400 (EDT) |
arunisaac pushed a commit to branch master
in repository guix.
commit ff564de64cdd4bd3d6d578b0beeefef1d062e68f
Author: Arun Isaac <arunisaac@systemreboot.net>
AuthorDate: Sat Aug 13 16:47:31 2022 +0530
gnu: kiwix-lib: Update to 11.0.0.
* gnu/packages/web.scm (kiwix-lib): Update to 11.0.0.
[arguments]: Do not explicitly pass mustache path to CPPFLAGS. Do not return
#t from phases. Use search-input-file.
[native-inputs]: Remove labels. Use cpp-mustache package instead of its
source.
---
gnu/packages/web.scm | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c4eac670e8..8c7df5af1e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -109,6 +109,7 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-gtk)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages curl)
@@ -7986,7 +7987,7 @@ for ZIM files.")
(define-public kiwix-lib
(package
(name "kiwix-lib")
- (version "9.4.1")
+ (version "11.0.0")
(home-page "https://github.com/kiwix/kiwix-lib/")
(source (origin
(method git-fetch)
@@ -7995,7 +7996,7 @@ for ZIM files.")
(commit version)))
(sha256
(base32
- "034nk6l623v78clrs2d0k1vg69sbzrd8c0q79qiqmlkinck1nkxw"))
+ "1w5dabzvd3cnhw064qf9166476fszkkxjcml21x35av0dcd1vlk6"))
(file-name (git-file-name name version))))
(build-system meson-build-system)
(arguments
@@ -8003,13 +8004,11 @@ for ZIM files.")
(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)))))
+ (search-input-file inputs "/bin/aria2c")
+ "\""))))))))
(inputs
(list aria2
curl
@@ -8021,19 +8020,10 @@ for ZIM files.")
zlib
`(,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)
- ;; for kiwix-compile-resources
- ("python" ,python-wrapper)))
+ (list cpp-mustache
+ pkg-config
+ ;; for kiwix-compile-resources
+ python-wrapper))
(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.")
- branch master updated (887a5fd5a3 -> e05d5d8251), guix-commits, 2022/08/13
- 04/06: gnu: kiwix-desktop: Update to 2.2.2., guix-commits, 2022/08/13
- 01/06: gnu: Add cpp-mustache., guix-commits, 2022/08/13
- 02/06: gnu: libzim: Update to 8.0.0., guix-commits, 2022/08/13
- 06/06: gnu: kiwix-desktop: Add bash-minimal to inputs., guix-commits, 2022/08/13
- 05/06: gnu: kiwix-tools: Update to 3.3.0., guix-commits, 2022/08/13
- 03/06: gnu: kiwix-lib: Update to 11.0.0.,
guix-commits <=