| Message ID | YWsOPFdSwmJKR4KZ@jasmine.lan |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#50859,core-updates-frozen] gnu: tzdata: Update to 2021b. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/applying patch | fail | View Laminar job |
| cbaines/issue | success | View issue |
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
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?
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
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.
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