From 5b84b46a75fdd55615c7c71d1a1977eb4aad57c6 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 9 Jun 2024 15:02:30 +0000 Subject: [PATCH] gnu: zeal: Update to 0.7.1. * gnu/packages/documentation.scm (zeal): Update to 0.7.1. [arguments]: Convert to gexp. [inputs]: Use new label-less style. Change-Id: I9d2851ee303f2e8ebed80b4a1e463aa290bea111 Signed-off-by: Andreas Enge --- gnu/packages/documentation.scm | 84 +++++++++++++++++----------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 12fbaf1d0c..2a047ba790 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021, 2022 Marius Bakke ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2024 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,52 +411,49 @@ the Net to search for documents which are not on the local system.") (license license:lgpl2.1+))) (define-public zeal - (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2") - (revision "1")) - (package - (name "zeal") - (version (git-version "0.6.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zealdocs/zeal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3")))) - (build-system qt-build-system) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases + (package + (name "zeal") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zealdocs/zeal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp")))) + (build-system qt-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases (add-after 'wrap 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/zeal")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin/zeal")) + (qt-process-path + (search-input-file inputs + "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) - (native-inputs - (list extra-cmake-modules pkg-config)) - (inputs - `(("libarchive" ,libarchive) - ("sqlite" ,sqlite) - ("qtbase" ,qtbase-5) - ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine-5" ,qtwebengine-5) - ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtx11extras" ,qtx11extras) - ("xcb-util-keyms" ,xcb-util-keysyms))) - (home-page "https://zealdocs.org/") - (synopsis "Offline documentation browser inspired by Dash") - (description "Zeal is a simple offline documentation browser + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list libarchive + sqlite + qtbase-5 + qtdeclarative-5 + qtwebchannel-5 + qtwebengine-5 + qtquickcontrols-5 + qtx11extras + xcb-util-keysyms)) + (home-page "https://zealdocs.org/") + (synopsis "Offline documentation browser inspired by Dash") + (description "Zeal is a simple offline documentation browser inspired by Dash.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public markdeep (package