2 files changed, 57 insertions, 59 deletions

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index a735b5a0cc6..03c9412df3e 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -105,61 +105,59 @@ 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
+  (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
+     '(#: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")))))
+         (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"))))
+         (replace 'check
+           (lambda _
+             (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))))
+    (home-page "https://howardhinnant.github.io/date/date.html")
+    (license license:expat)))
 
 (define-public libical
   (package
diff --git a/gnu/packages/patches/date-output-pkg-config-files.patch b/gnu/packages/patches/date-output-pkg-config-files.patch
index 3fd1d54b369..cfef1d8512b 100644
--- a/gnu/packages/patches/date-output-pkg-config-files.patch
+++ b/gnu/packages/patches/date-output-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001
+From 13762204d70733b6e7510ccd323b9b1e77c06c0f Mon Sep 17 00:00:00 2001
 From: Cole Mickens <cole.mickens@gmail.com>
 Date: Sun, 26 Jan 2020 01:27:08 -0800
 Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
@@ -10,16 +10,16 @@ Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
  create mode 100644 date.pc.in
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f30c473..fe778e8 100644
+index 012512a..5fbea80 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB )
+@@ -158,6 +158,15 @@ if( BUILD_TZ_LIB )
      endif( )
  endif( )
  
 +if ( BUILD_TZ_LIB )
 +  # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
-+  set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:tz>,-D$<JOIN:$<TARGET_PROPERTY:tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
++  set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:date-tz>,-D$<JOIN:$<TARGET_PROPERTY:date-tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
 +  configure_file(date.pc.in date.pc.cf @ONLY)
 +  file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc"
 +    INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" )
@@ -29,7 +29,7 @@ index f30c473..fe778e8 100644
  #[===================================================================[
     installation
  #]===================================================================]
-@@ -171,6 +180,12 @@ install (
+@@ -201,6 +210,12 @@ install (
    FILES cmake/dateConfig.cmake "${version_config}"
    DESTINATION ${CONFIG_LOC})
  
@@ -56,5 +56,5 @@ index 0000000..b9c4623
 +Name: date
 +Description: A date and time library based on the C++11/14/17 <chrono> header
 +Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -ltz
++Libs: -L${libdir} -ldate-tz
 +Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@