From e2832cdc3599e3bbc0362f9749835ffbae1b1944 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Feb 2018 20:36:31 -0500 Subject: gnu: tzdata: Update to 2018c. * gnu/packages/base.scm (tzdata): Update to 2018c. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 92acbd3640..80fb0c17c2 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1081,7 +1081,7 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2017c") + (version "2018c") (source (origin (method url-fetch) (uri (string-append @@ -1089,7 +1089,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n")))) + "1xik57rdi7kqa0wb5jbz7vyjyxpr88lw1g4kscj0ylpgnzjc6998")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -1137,7 +1137,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41")))))) + "0rg6s1vlgwd8sjhla55hx2h5m2xbx0shm347pkbg4vsaz707zyii")))))) (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) -- cgit v1.2.3 From 62868f124cf9443a43f4ea5867da692e32e77c58 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Feb 2018 23:47:46 -0500 Subject: gnu: tzdata: Preserve directory layout from before tzdata 2018a. tzdata 2018a instroduced some changes to the build and installation procedures that commit e2832cdc3 failed to address. They are described in the NEWS file. This is a followup to commit e2832cdc3599e3bbc0362f9749835ffbae1b1944. * gnu/packages/base.scm (tzdata)[arguments]: Set TZDEFAULT. Remove the time-zone utility programs in a build phase. --- gnu/packages/base.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 80fb0c17c2..f0964d7927 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1097,10 +1097,8 @@ command.") (tmp (getenv "TMPDIR"))) (list (string-append "TOPDIR=" out) (string-append "TZDIR=" out "/share/zoneinfo") - - ;; Discard zic, dump, and tzselect, already - ;; provided by glibc. - (string-append "ETCDIR=" tmp "/etc") + (string-append "TZDEFAULT=" out + "/share/zoneinfo/localtime") ;; Likewise for the C library routines. (string-append "LIBDIR=" tmp "/lib") @@ -1121,6 +1119,9 @@ command.") (lambda* (#:key outputs #:allow-other-keys) ;; Move data in the right place. (let ((out (assoc-ref outputs "out"))) + ;; Discard zic, dump, and tzselect, already + ;; provided by glibc. + (delete-file-recursively (string-append out "/usr")) (symlink (string-append out "/share/zoneinfo") (string-append out "/share/zoneinfo/posix")) (delete-file-recursively -- cgit v1.2.3 From eadcdc742207dccf29230fafe03634cad3af4707 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 20 Feb 2018 14:05:30 -0500 Subject: gnu: tzdata: Restore the test variant tzdata-for-tests. Commit 62868f124cf (gnu: tzdata: Preserve directory layout from before tzdata 2018a) changed the derivation of this package, which doesn't need to change yet. * gnu/packages/base.scm (tzdata-for-tests)[arguments]: Copy the build arguments from before commit 62868f124cf9443a43f4ea5867da692e32e77c58. --- gnu/packages/base.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 87a12e8b8c..b6c6dabae1 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1164,6 +1164,45 @@ and daylight-saving rules.") (sha256 (base32 "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n")))) + (arguments + '(#:tests? #f + #:make-flags (let ((out (assoc-ref %outputs "out")) + (tmp (getenv "TMPDIR"))) + (list (string-append "TOPDIR=" out) + (string-append "TZDIR=" out "/share/zoneinfo") + + ;; Discard zic, dump, and tzselect, already + ;; provided by glibc. + (string-append "ETCDIR=" tmp "/etc") + + ;; Likewise for the C library routines. + (string-append "LIBDIR=" tmp "/lib") + (string-append "MANDIR=" tmp "/man") + + "AWK=awk" + "CC=gcc")) + #:modules ((guix build utils) + (guix build gnu-build-system) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source inputs #:allow-other-keys) + (and (zero? (system* "tar" "xvf" source)) + (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move data in the right place. + (let ((out (assoc-ref outputs "out"))) + (symlink (string-append out "/share/zoneinfo") + (string-append out "/share/zoneinfo/posix")) + (delete-file-recursively + (string-append out "/share/zoneinfo-posix")) + (copy-recursively (string-append out "/share/zoneinfo-leaps") + (string-append out "/share/zoneinfo/right")) + (delete-file-recursively + (string-append out "/share/zoneinfo-leaps"))))) + (delete 'configure)))) (inputs `(("tzcode" ,(origin (method url-fetch) (uri (string-append @@ -1173,7 +1212,6 @@ and daylight-saving rules.") (base32 "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41"))))))))) - (define-public libiconv (package (name "libiconv") -- cgit v1.2.3