[core-updates-frozen] gnu: tzdata: Update to 2021b.

Done

Details

2 participants

Leo Famulari
Maxim Cournoyer

Owner: unassigned

Submitted by: Leo Famulari

Severity: normal

Leo Famulari wrote on 28 Sep 2021 00:59

Recipients:(address . guix-patches@gnu.org)

Message-ID:784f7000e97347e23e9f6c9fc7f416eaa4481e0a.1632783573.git.leo@famulari.name

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021b.

---

gnu/packages/base.scm | 29 ++++-------------------------

1 file changed, 4 insertions(+), 25 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 174af43917..d0f601b5be 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1230,7 +1230,7 @@ command.")
     (name "tzdata")
     ;; This package should be kept in sync with python-pytz in (gnu packages
     ;; time).
-    (version "2021a")
+    (version "2021b")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1238,7 +1238,7 @@ command.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
+               "1dyyqcxwhk7bx9lzlxg10rn3i0c12i0d2ngzgcmzxpsrvgdydnak"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f
@@ -1306,7 +1306,7 @@ command.")
                           version ".tar.gz"))
                     (sha256
                      (base32
-                      "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))
+                      "0qdkr02dkyhiqflwgq7dvv87c2qi5dm5yny2kwaxva59h7iczblr")))))
     (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)
@@ -1321,28 +1321,7 @@ and daylight-saving rules.")
 ;;; thousands of packages (for example, in a core-updates rebuild). This package
 ;;; will typically be obsolete and should never be referred to by a built
 ;;; package.
-(define-public tzdata-for-tests
-  (hidden-package
-   (package
-     (inherit tzdata)
-     (version "2021a")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append
-                     "https://data.iana.org/time-zones/releases/tzdata"
-                     version ".tar.gz"))
-               (sha256
-                (base32
-                 "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
-     (inputs
-      (list (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://data.iana.org/time-zones/releases/tzcode"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"))))))))
+(define-public tzdata-for-tests tzdata)
 
 (define-public libiconv
   (package
-- 
2.33.0

Leo Famulari wrote on 28 Sep 2021 01:11

(no subject)

Recipients:(address . control@debbugs.gnu.org)

Message-ID:YVJPiWdiI80d7glp@jasmine.lan

block 50860 with 50859
block 50860 with 50830
block 50860 with 50358

Leo Famulari wrote on 29 Sep 2021 16:36

Recipients:(address . controL@debbugs.gnu.org)

Message-ID:YVR58SnzcokReKZU@jasmine.lan

block 50358 with 50859

Leo Famulari wrote on 5 Oct 2021 01:14

[core-updates-frozen vv2] gnu: tzdata: Update to 2021c.

Recipients:(address . 50859@debbugs.gnu.org)

Message-ID:6671ff8b38883a161f1a7d6e617cc53e74717c88.1633389249.git.leo@famulari.name

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021c.

---

gnu/packages/base.scm | 32 +++++++-------------------------

1 file changed, 7 insertions(+), 25 deletions(-)

Toggle diff (66 lines)diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 174af43917..1eea658791 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1230,7 +1230,7 @@ command.")
     (name "tzdata")
     ;; This package should be kept in sync with python-pytz in (gnu packages
     ;; time).
-    (version "2021a")
+    (version "2021c")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1238,7 +1238,7 @@ command.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
+               "0himprzx3ahxkmg4rvp8n5lqry76qzc65j6sfq151hqirg4d3wdl"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f
@@ -1306,7 +1306,7 @@ command.")
                           version ".tar.gz"))
                     (sha256
                      (base32
-                      "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))
+                      "01fsa661vzdij46z286pa8q07cppqz29sr2pf0qqldqpldbb6km3")))))
     (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)
@@ -1321,28 +1321,10 @@ and daylight-saving rules.")
 ;;; thousands of packages (for example, in a core-updates rebuild). This package
 ;;; will typically be obsolete and should never be referred to by a built
 ;;; package.
-(define-public tzdata-for-tests
-  (hidden-package
-   (package
-     (inherit tzdata)
-     (version "2021a")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append
-                     "https://data.iana.org/time-zones/releases/tzdata"
-                     version ".tar.gz"))
-               (sha256
-                (base32
-                 "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
-     (inputs
-      (list (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://data.iana.org/time-zones/releases/tzcode"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"))))))))
+;;;
+;;; Please make this a hidden-package if it is different from the primary tzdata
+;;; package.
+(define-public tzdata-for-tests tzdata)
 
 (define-public libiconv
   (package
-- 
2.33.0

Maxim Cournoyer wrote on 12 Oct 2021 06:36

Re: bug#50859: [core-updates-frozen] gnu: tzdata: Update to 2021b.

Recipients:(name . Leo Famulari)(address . leo@famulari.name)(address . 50859@debbugs.gnu.org)

Message-ID:87mtnezwo3.fsf_-_@gmail.com

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

Toggle quote (41 lines)> * gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021c.
> ---
>  gnu/packages/base.scm | 32 +++++++-------------------------
>  1 file changed, 7 insertions(+), 25 deletions(-)
>
> diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
> index 174af43917..1eea658791 100644
> --- a/gnu/packages/base.scm
> +++ b/gnu/packages/base.scm
> @@ -1230,7 +1230,7 @@ command.")
>      (name "tzdata")
>      ;; This package should be kept in sync with python-pytz in (gnu packages
>      ;; time).
> -    (version "2021a")
> +    (version "2021c")
>      (source (origin
>               (method url-fetch)
>               (uri (string-append
> @@ -1238,7 +1238,7 @@ command.")
>                     version ".tar.gz"))
>               (sha256
>                (base32
> -               "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
> +               "0himprzx3ahxkmg4rvp8n5lqry76qzc65j6sfq151hqirg4d3wdl"))))
>      (build-system gnu-build-system)
>      (arguments
>       (list #:tests? #f
> @@ -1306,7 +1306,7 @@ command.")
>                            version ".tar.gz"))
>                      (sha256
>                       (base32
> -                      "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))
> +                      "01fsa661vzdij46z286pa8q07cppqz29sr2pf0qqldqpldbb6km3")))))
>      (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)
> @@ -1321,28 +1321,10 @@ and daylight-saving rules.")
>  ;;; thousands of packages (for example, in a core-updates rebuild). This package
>  ;;; will typically be obsolete and should never be referred to by a built
>  ;;; package.

LGTM.

Toggle quote (27 lines)> -(define-public tzdata-for-tests
> -  (hidden-package
> -   (package
> -     (inherit tzdata)
> -     (version "2021a")
> -     (source (origin
> -               (method url-fetch)
> -               (uri (string-append
> -                     "https://data.iana.org/time-zones/releases/tzdata"
> -                     version ".tar.gz"))
> -               (sha256
> -                (base32
> -                 "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
> -     (inputs
> -      (list (origin
> -              (method url-fetch)
> -              (uri (string-append
> -                    "https://data.iana.org/time-zones/releases/tzcode"
> -                    version ".tar.gz"))
> -              (sha256
> -               (base32
> -                "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"))))))))
> +;;;
> +;;; Please make this a hidden-package if it is different from the primary tzdata
> +;;; package.
> +(define-public tzdata-for-tests tzdata)

Why do we keep the above? I'm sed it out of the code base instead.

If you want, I can push this change along 50358 when I get to it, which

will cause a world rebuild.

Thanks,

Maxim

Leo Famulari wrote on 16 Oct 2021 19:32

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 50859@debbugs.gnu.org)

Message-ID:YWsMwzFBmlVz1970@jasmine.lan

On Tue, Oct 12, 2021 at 12:36:44AM -0400, Maxim Cournoyer wrote:

Toggle quote (5 lines)

> Why do we keep the above? I'm sed it out of the code base instead.

> If you want, I can push this change along 50358 when I get to it, which

> will cause a world rebuild.

Sure, feel free. We can add tzdata-for-tests back when we want it again.

Leo Famulari wrote on 16 Oct 2021 19:39

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 50859@debbugs.gnu.org)

Message-ID:YWsOPFdSwmJKR4KZ@jasmine.lan

On Sat, Oct 16, 2021 at 01:32:51PM -0400, Leo Famulari wrote:

Toggle quote (8 lines)

> On Tue, Oct 12, 2021 at 12:36:44AM -0400, Maxim Cournoyer wrote:

> > Why do we keep the above? I'm sed it out of the code base instead.

> >

> > If you want, I can push this change along 50358 when I get to it, which

> > will cause a world rebuild.

> Sure, feel free. We can add tzdata-for-tests back when we want it again.

Here is another update, in case you haven't started building yet.

From 9c0375b622f259ac213676be9ade95f1d9422d3b Mon Sep 17 00:00:00 2001

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021d.

---

gnu/packages/base.scm | 32 +++++++-------------------------

1 file changed, 7 insertions(+), 25 deletions(-)

Toggle diff (66 lines)diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 174af43917..5d66e7292f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1230,7 +1230,7 @@ command.")
     (name "tzdata")
     ;; This package should be kept in sync with python-pytz in (gnu packages
     ;; time).
-    (version "2021a")
+    (version "2021d")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1238,7 +1238,7 @@ command.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
+               "1xnxvd15kjl47ls43kq2ngyjnipzq5ldr7saxqjkqjixnfi8ihfp"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f
@@ -1306,7 +1306,7 @@ command.")
                           version ".tar.gz"))
                     (sha256
                      (base32
-                      "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))
+                      "07ar3y9a9fyw0b9h3x1jpy8a8p9iz7m9l8qzp94l8kxmg6z043gd")))))
     (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)
@@ -1321,28 +1321,10 @@ and daylight-saving rules.")
 ;;; thousands of packages (for example, in a core-updates rebuild). This package
 ;;; will typically be obsolete and should never be referred to by a built
 ;;; package.
-(define-public tzdata-for-tests
-  (hidden-package
-   (package
-     (inherit tzdata)
-     (version "2021a")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append
-                     "https://data.iana.org/time-zones/releases/tzdata"
-                     version ".tar.gz"))
-               (sha256
-                (base32
-                 "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
-     (inputs
-      (list (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://data.iana.org/time-zones/releases/tzcode"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"))))))))
+;;;
+;;; Please make this a hidden-package if it is different from the primary tzdata
+;;; package.
+(define-public tzdata-for-tests tzdata)
 
 (define-public libiconv
   (package
-- 
2.33.0

Maxim Cournoyer wrote on 26 Oct 2021 06:06

Recipients:(name . Leo Famulari)(address . leo@famulari.name)(address . 50859@debbugs.gnu.org)

Message-ID:8735oofn04.fsf@gmail.com

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

Toggle quote (11 lines)> On Sat, Oct 16, 2021 at 01:32:51PM -0400, Leo Famulari wrote:
>> On Tue, Oct 12, 2021 at 12:36:44AM -0400, Maxim Cournoyer wrote:
>> > Why do we keep the above?  I'm sed it out of the code base instead.
>> > 
>> > If you want, I can push this change along 50358 when I get to it, which
>> > will cause a world rebuild.
>> 
>> Sure, feel free. We can add tzdata-for-tests back when we want it again.
>
> Here is another update, in case you haven't started building yet.

Thanks, I've been building the cufbc branch manually for now (the CI

seems to have some problem with the branch, but the logs won't say

what).

I'm hoping we won't have to go through another world rebuild at this

point. I'm trying to test the branch some more then I'd like to merge

it into cuf.

You can push the update to the core-updates branch.

Thanks,

Maxim

Leo Famulari wrote on 26 Oct 2021 19:50

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 50859@debbugs.gnu.org)

Message-ID:YXg/6nbw3a05vqLF@jasmine.lan

On Tue, Oct 26, 2021 at 12:06:35AM -0400, Maxim Cournoyer wrote:

Toggle quote (8 lines)

> Thanks, I've been building the cufbc branch manually for now (the CI

> seems to have some problem with the branch, but the logs won't say

> what).

> I'm hoping we won't have to go through another world rebuild at this

> point. I'm trying to test the branch some more then I'd like to merge

> it into cuf.

If CI hasn't evaluated the branch yet, then updating tzdata (yet again,
to 2021e) shouldn't require extra rebuilding when the time comes to
actually build the branch with Cuirass. The same number of packages will
need to be built whether we use the current tzdata release or an older
release. Or do I misunderstand your objection?

Leo Famulari wrote on 26 Oct 2021 19:53

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 50859@debbugs.gnu.org)

Message-ID:YXhAfSF8mdPS4f5A@jasmine.lan

Leo Famulari <leo@famulari.name> writes:

Toggle quote (2 lines)

> Here is another update, in case you haven't started building yet.

And another update, to 2021e... attached.

From d9b32f6c97f05314bf8b213c69e1546819351056 Mon Sep 17 00:00:00 2001

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021e.

---

gnu/packages/base.scm | 32 +++++++-------------------------

1 file changed, 7 insertions(+), 25 deletions(-)

Toggle diff (66 lines)diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 174af43917..ab67a5d862 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1230,7 +1230,7 @@ command.")
     (name "tzdata")
     ;; This package should be kept in sync with python-pytz in (gnu packages
     ;; time).
-    (version "2021a")
+    (version "2021e")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -1238,7 +1238,7 @@ command.")
                    version ".tar.gz"))
              (sha256
               (base32
-               "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
+               "1cdjdcxl0s9xf0dg1z64kh7llm80byxqlzrkkjzcdlyh6yvl5v07"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f
@@ -1306,7 +1306,7 @@ command.")
                           version ".tar.gz"))
                     (sha256
                      (base32
-                      "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))
+                      "0x8pcfmjvxk29yfh8bklchv2f0vpl4yih0gc4wyx292l78wncijq")))))
     (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)
@@ -1321,28 +1321,10 @@ and daylight-saving rules.")
 ;;; thousands of packages (for example, in a core-updates rebuild). This package
 ;;; will typically be obsolete and should never be referred to by a built
 ;;; package.
-(define-public tzdata-for-tests
-  (hidden-package
-   (package
-     (inherit tzdata)
-     (version "2021a")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append
-                     "https://data.iana.org/time-zones/releases/tzdata"
-                     version ".tar.gz"))
-               (sha256
-                (base32
-                 "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr"))))
-     (inputs
-      (list (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://data.iana.org/time-zones/releases/tzcode"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"))))))))
+;;;
+;;; Please make this a hidden-package if it is different from the primary tzdata
+;;; package.
+(define-public tzdata-for-tests tzdata)
 
 (define-public libiconv
   (package
-- 
2.33.1

Maxim Cournoyer wrote on 26 Oct 2021 21:52

Recipients:(name . Leo Famulari)(address . leo@famulari.name)(address . 50859@debbugs.gnu.org)

Message-ID:87zgqv4l89.fsf@gmail.com

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

Toggle quote (15 lines)> On Tue, Oct 26, 2021 at 12:06:35AM -0400, Maxim Cournoyer wrote:
>> Thanks, I've been building the cufbc branch manually for now (the CI
>> seems to have some problem with the branch, but the logs won't say
>> what).
>> 
>> I'm hoping we won't have to go through another world rebuild at this
>> point.  I'm trying to test the branch some more then I'd like to merge
>> it into cuf.
>
> If CI hasn't evaluated the branch yet, then updating tzdata (yet again,
> to 2021e) shouldn't require extra rebuilding when the time comes to
> actually build the branch with Cuirass. The same number of packages will
> need to be built whether we use the current tzdata release or an older
> release. Or do I misunderstand your objection?

Sorry I wasn't clear; what I meant by 'manually' is by ssh'ing to berlin

and having it built there; so it's already cached as we speak with items

such as rust, ungoogled-chromium and other biggies already built, at

least for the x86_64 arch.

Thanks,

Maxim

Leo Famulari wrote on 26 Oct 2021 22:34

Recipients:(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 50859@debbugs.gnu.org)

Message-ID:YXhmQ59hbtmyC3nr@jasmine.lan

On Tue, Oct 26, 2021 at 03:52:38PM -0400, Maxim Cournoyer wrote:

Toggle quote (5 lines)

> Sorry I wasn't clear; what I meant by 'manually' is by ssh'ing to berlin

> and having it built there; so it's already cached as we speak with items

> such as rust, ungoogled-chromium and other biggies already built, at

> least for the x86_64 arch.

Oh, understood. It's a shame that we won't have web-based logs for these

builds... but oh well. It's more important to get the branch built.

Maxim Cournoyer wrote on 12 Nov 2021 06:50

Recipients:(name . Leo Famulari)(address . leo@famulari.name)(address . 50859-done@debbugs.gnu.org)

Message-ID:87y25tq5wd.fsf_-_@gmail.com

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

Toggle quote (5 lines)

> Leo Famulari <leo@famulari.name> writes:

>> Here is another update, in case you haven't started building yet.

> And another update, to 2021e... attached.

Applied with commit af8b03b4e26ec1e50559062d3115398eb6a63c2c.

Thanks,

Maxim

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 50859@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date