1 files changed, 51 insertions, 55 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index a735b5a0cc..faf7779ce7 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -105,61 +105,57 @@ available in French.")
       (license license:gpl2))))
 
 (define-public date
-  ;; We make the same choice as the Arch package maintainer by choosing a
-  ;; recent commit to fix some bugs.
-  ;; https://github.com/Alexays/Waybar/issues/565
-  (let ((commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))
-    (package
-      (name "date")
-      (version (string-append "2.4.1-" (string-take commit 8)))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/HowardHinnant/date")
-               (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083"))
-         (patches
-          ;; Install pkg-config files
-          ;; https://github.com/HowardHinnant/date/pull/538
-          (search-patches "date-ignore-zonenow.patch"
-                          "date-output-pkg-config-files.patch"))))
-      (inputs (list tzdata))
-      (build-system cmake-build-system)
-      (arguments
-       '(#:configure-flags (list "-DUSE_SYSTEM_TZ_DB=ON"
-                                 "-DBUILD_SHARED_LIBS=ON"
-                                 "-DBUILD_TZ_LIB=ON"
-                                 "-DENABLE_DATE_TESTING=ON")
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'patch-bin-bash
-             (lambda* (#:key inputs #:allow-other-keys)
-               (substitute* "compile_fail.sh"
-                 (("/bin/bash") (which "bash")))
-               #t))
-           (add-after 'unpack 'patch-zoneinfo-path
-             (lambda* (#:key inputs #:allow-other-keys)
-               (substitute* "src/tz.cpp"
-                 (("/usr/share/zoneinfo")
-                  (search-input-directory inputs
-                                          "share/zoneinfo")))))
-           (replace 'check
-             (lambda _
-               ;; Disable test that requires checking timezone that
-               ;; isn't set in the build environment.
-               (substitute* "CTestTestfile.cmake"
-                 (("add_test.tz_test_pass_zoned_time_deduction_test.*") "")
-                 (("set_tests_properties.tz_test_pass_zoned_time_deduction_test.*") ""))
-               (invoke "make" "testit"))))))
-      (synopsis "Date and time library for C++11 and C++14")
-      (description "Date is a header only C++ library that extends the chrono
-date algorithms library for calendar dates and durations.  It also provides
-the <tz.h> library for handling time zones and leap seconds.")
-      (home-page "https://howardhinnant.github.io/date/date.html")
-      (license license:expat))))
+  (package
+    (name "date")
+    (version "3.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/HowardHinnant/date")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35"))
+       (patches
+        ;; Install pkg-config files
+        ;; https://github.com/HowardHinnant/date/pull/538
+        (search-patches "date-ignore-zonenow.patch"
+                        "date-output-pkg-config-files.patch"))))
+    (inputs (list tzdata))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:test-target "testit"
+      #:configure-flags
+      #~(list "-DUSE_SYSTEM_TZ_DB=ON" "-DBUILD_SHARED_LIBS=ON"
+              "-DBUILD_TZ_LIB=ON" "-DENABLE_DATE_TESTING=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-bin-bash
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "compile_fail.sh"
+                (("/bin/bash")
+                 (search-input-file inputs "bin/bash")))))
+          (add-after 'unpack 'patch-zoneinfo-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/tz.cpp"
+                (("/usr/share/zoneinfo")
+                 (search-input-directory inputs "share/zoneinfo")))))
+          (add-after 'unpack 'skip-failing-tests
+            ;; Disable test that requires checking timezone that
+            ;; isn't set in the build environment.
+            (lambda _
+              (for-each delete-file
+                        '("test/solar_hijri_test/parse.pass.cpp"
+                          "test/tz_test/zoned_time_deduction.pass.cpp")))))))
+    (synopsis "Date and time library for C++11 and C++14")
+    (description
+     "Date is a header only C++ library that extends the chrono date
+algorithms library for calendar dates and durations.  It also provides the
+<tz.h> library for handling time zones and leap seconds.")
+    (home-page "https://howardhinnant.github.io/date/date.html")
+    (license license:expat)))
 
 (define-public libical
   (package