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

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

[Leo Famulari]

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021b.
---
 gnu/packages/base.scm | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

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

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

[Leo Famulari]

* 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.
-(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

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

[Maxim Cournoyer]

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

> * 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.

> -(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

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

[Leo Famulari]

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.

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

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 469 bytes --]

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.

[-- Attachment #1.2: 0001-gnu-tzdata-Update-to-2021d.patch --]
[-- Type: text/plain, Size: 2934 bytes --]

From 9c0375b622f259ac213676be9ade95f1d9422d3b Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sun, 26 Sep 2021 22:38:25 -0400
Subject: [PATCH] gnu: tzdata: Update to 2021d.

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021d.
---
 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..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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Maxim Cournoyer]

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

> 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

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

[Leo Famulari]

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?

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

[Maxim Cournoyer]

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

> 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

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

[Leo Famulari]

On Tue, Oct 26, 2021 at 03:52:38PM -0400, Maxim Cournoyer wrote:
> 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.

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

Leo Famulari <leo@famulari.name> writes:
> Here is another update, in case you haven't started building yet.

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

[-- Attachment #2: 0001-gnu-tzdata-Update-to-2021e.patch --]
[-- Type: text/plain, Size: 2857 bytes --]

From d9b32f6c97f05314bf8b213c69e1546819351056 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sun, 26 Sep 2021 22:38:25 -0400
Subject: [PATCH] gnu: tzdata: Update to 2021e.

* gnu/packages/base.scm (tzdata, tzdata-for-tests): Update to 2021e.
---
 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..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

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

[Maxim Cournoyer]

Hello Leo,

Leo Famulari <leo@famulari.name> writes:

> 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