diff options
Diffstat (limited to 'gnu/packages/rednotebook.scm')
| -rw-r--r-- | gnu/packages/rednotebook.scm | 73 |
1 files changed, 39 insertions, 34 deletions
diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm index 6d61fa1391..6dcc8a2cac 100644 --- a/gnu/packages/rednotebook.scm +++ b/gnu/packages/rednotebook.scm @@ -18,21 +18,25 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages rednotebook) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages bash) - #:use-module (gnu packages python) + #:use-module (gnu packages check) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) - #:use-module (gnu packages webkit) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages webkit)) (define-public rednotebook (package (name "rednotebook") - (version "2.22") + (version "2.41") (source (origin (method git-fetch) @@ -41,35 +45,36 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5")))) - (build-system python-build-system) + (base32 "1nljj227lykl4gq1qvvv0pj00k8pbi3njm4agz7wsfcihz6dlrxi")))) + (build-system pyproject-build-system) (arguments - ;; Tests fail to find the "_" function. - ;; It should be defined in rednotebook/info.py if '_' is not a member of - ;; 'builtins'. It is either not defined or not exported during the check - ;; phase. The program does not have this problem after it is installed. - ;; TODO: Fix tests. - `(#:tests? #f - #:imported-modules ((guix build glib-or-gtk-build-system) - ,@%python-build-system-modules) - #:modules ((ice-9 match) - (guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) - #:phases - (modify-phases %standard-phases - ;; Make sure rednotebook can find the typelibs and webkitgtk shared - ;; libraries. - (add-before 'wrap 'wrap-with-library-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (webkitgtk-path (string-append - (assoc-ref inputs "webkitgtk-for-gtk3") - "/lib"))) - (wrap-program (string-append out "/bin/rednotebook") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))))))))) + (list + #:imported-modules + `((guix build glib-or-gtk-build-system) + ,@%pyproject-build-system-modules) + #:modules + `((ice-9 match) + (guix build pyproject-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'configure-tests + (lambda _ + (setenv "HOME" (getcwd)))) + ;; Make sure rednotebook can find the typelibs and webkitgtk shared + ;; libraries. + (add-before 'wrap 'wrap-with-library-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((webkitgtk-bin (search-input-file inputs + "bin/WebKitWebDriver"))) + (wrap-program (string-append #$output "/bin/rednotebook") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append (dirname (dirname webkitgtk-bin)) + "/lib")))))))))) + (native-inputs (list gettext-minimal python-pytest python-setuptools)) (inputs (list bash-minimal gtk+ @@ -79,7 +84,7 @@ webkitgtk-for-gtk3)) ;; TODO: package the following for python3 (if possible), add them as ;; dependencies, and remove them from rednotebook source: - ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags + ;; pygtkspellcheck, elib.intl, txt2tags ;; TODO: package and add pyenchant for python3 and add it as a dependency. (home-page "https://www.rednotebook.app") (synopsis "Daily journal with calendar, templates and keyword searching") |