diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/base.scm | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
| download | guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index bd352319a1..afd772488e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1225,7 +1225,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2020b") + (version "2020d") (source (origin (method url-fetch) (uri (string-append @@ -1233,10 +1233,10 @@ command.") version ".tar.gz")) (sha256 (base32 - "02g88pbw82zr36x9dz5ib4sq6bfq253yx5hbhnfyhp143naky1cv")))) + "1wxskk9mh1x2073n99qna2mq58mgi648mbq5dxlqfcrnvrbkk0cd")))) (build-system gnu-build-system) (arguments - '(#:tests? #f + `(#:tests? #f #:make-flags (let ((out (assoc-ref %outputs "out")) (tmp (getenv "TMPDIR"))) (list (string-append "TOPDIR=" out) @@ -1248,6 +1248,16 @@ command.") (string-append "LIBDIR=" tmp "/lib") (string-append "MANDIR=" tmp "/man") + ;; XXX: tzdata 2020b changed the on-disk format + ;; of the time zone files from 'fat' to 'slim'. + ;; Many packages (particularly evolution-data-server) + ;; can not yet handle the latter, so we stick with + ;; 'fat' for now. + ,@(if (version>=? (package-version this-package) + "2020b") + '("CPPFLAGS=-DZIC_BLOAT_DEFAULT='\"fat\"'") + '()) + "AWK=awk" "CC=gcc")) #:modules ((guix build utils) @@ -1282,7 +1292,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1nj3zvqpy5lm6w365p9ynz4i5arq4fiy8ldq55v4z9p49nagivs7")))))) + "1mgsckixmmk9qxzsflfxnp3999qi3ls72bgksclk01g852x51w3c")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) |