diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/time.scm | |
parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/time.scm')
-rw-r--r-- | gnu/packages/time.scm | 64 |
1 files changed, 61 insertions, 3 deletions
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 97de5485ef..9b57fe41fb 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -19,6 +19,8 @@ ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2021 Ryan Prior <rprior@protonmail.com> +;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> +;;; Copyright © 2022 Pradana AUMARS <paumars@courrier.dev> ;;; ;;; This file is part of GNU Guix. ;;; @@ -157,7 +159,30 @@ saving time. Almost all of the Olson timezones are supported.") (build-system python-build-system) ;; XXX: The PyPI distribution lacks tests, and the upstream repository ;; lacks a setup.py! - (arguments '(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Add setup.py to fix the build. Otherwise, the build will fail with + ;; "no setup.py found". + ;; + ;; Upstream uses Poetry to build python-pendulum, including parts + ;; written in C. Here, we simply add a setup.py file and do not build + ;; the parts written in C. This is possible because python-pendulum + ;; falls back on pure Python code when the C parts are not available + ;; (reference: build.py). + (add-after 'unpack 'add-setup.py + (lambda _ + (call-with-output-file "setup.py" + (lambda (port) + (format port + "from setuptools import find_packages, setup +setup(name='pendulum', + version='~a', + packages=find_packages()) +" + ,version)))))) + ;; XXX: The PyPI distribution lacks tests. + #:tests? #f)) (propagated-inputs (list python-dateutil python-pytzdata)) (home-page "https://github.com/sdispater/pendulum") @@ -213,14 +238,14 @@ datetime module, available in Python 2.3+.") (define-public python-parsedatetime (package (name "python-parsedatetime") - (version "2.4") + (version "2.6") (source (origin (method url-fetch) (uri (pypi-uri "parsedatetime" version)) (sha256 (base32 - "0jxqkjks7z9dn222cqgvskp4wr6d92aglinxq7pd2w4mzdc7r09x")))) + "0mfl0ixshqkwx7z5siaib7ix5j2iahb1jqfpyhqp42wan7xnicsc")))) (build-system python-build-system) (native-inputs (list python-nose python-pyicu python-pytest python-pytest-runner)) @@ -514,6 +539,39 @@ modifies the @code{time}, @code{gettimeofday} and @code{clock_gettime} system calls.") (license gpl2))) +(define-public tz + (package + (name "tz") + (version "0.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oz/tz") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nbl13xd95np89sbx8fn0jqrh1iy17hsy70kq31hmcvyns8dljhg")))) + (build-system go-build-system) + (arguments + `(#:go ,go-1.17 + #:import-path "github.com/oz/tz" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (invoke "go" "test" "-cover" import-path))))))) + (inputs + `(("github.com/charmbracelet/bubbletea" ,go-github-com-charmbracelet-bubbletea) + ("github.com/muesli/termenv" ,go-github-com-muesli-termenv))) + (home-page "https://github.com/oz/tz") + (synopsis "TUI time zone helper") + (description +"@command{tz} helps you schedule things across time zones. It is an interactive +TUI program that displays time across a few time zones of your choosing.") + (license gpl3+))) + (define-public countdown (package (name "countdown") |