summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-07-03 15:07:06 +0200
committerSharlatan Hellseher <sharlatanus@gmail.com>2025-07-04 12:50:27 +0100
commitcd1f687f5f4cbd9eb49a25bd8ec56771c79e7ccf (patch)
treecc56a16e8089ab27447f925cb55816585022c33f
parentbc62e66b9b670e496cf982f7b272f1a05c2c8110 (diff)
gnu: date: Improve style.
* gnu/packages/calendar.scm (date): Improve style. [arguments, description]: Run guix style, guix style -S arguments. {test-target}: Set it. {phases}: Improve phase 'patch-bin-bash. Change-Id: Iee808fcdd00ceb01d142d9ea23a7e71b5196fcc6 Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
-rw-r--r--gnu/packages/calendar.scm62
1 files changed, 30 insertions, 32 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 03c9412df3..faf7779ce7 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -112,8 +112,8 @@ available in French.")
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/HowardHinnant/date")
- (commit (string-append "v" version))))
+ (url "https://github.com/HowardHinnant/date")
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35"))
@@ -125,37 +125,35 @@ available in French.")
(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"))))))
+ (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.")
+ (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)))