diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/time.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/time.scm')
| -rw-r--r-- | gnu/packages/time.scm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index d6ebb59a1e..df4b8ac6f5 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2013, 2017, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2017, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> @@ -169,9 +169,6 @@ standard @code{datetime} all @code{datetime} instances can be replaced by Pendulum instances.") (license expat))) -(define-public python2-pendulum - (package-with-python2 python-pendulum)) - (define-public python-dateutil (package (name "python-dateutil") @@ -414,23 +411,24 @@ timestamps.") (define-public python-arrow (package (name "python-arrow") - (version "0.17.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "arrow" version)) (sha256 (base32 - "1m3fpz96w3g08i9x9cpqh3cr795y9zbj1bfnay3ccdhxv86d227z")))) + "0fl24gv7jc6b9pqxwlcgrf465i8v8h0y7dcm018yrqv0dhpn1ryy")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-vv" "tests" - ;; python-dateutil doesn't recognize America/Nuuk. - ;; Remove when python-dateutil > 2.8.1. - "-k" "not test_parse_tz_name_zzz")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests" + ;; python-dateutil doesn't recognize America/Nuuk. + ;; Remove when python-dateutil > 2.8.1. + "-k" "not test_parse_tz_name_zzz"))))))) (native-inputs `(;; For testing ("python-chai" ,python-chai) |