guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 4bfe972174e422ed60582e90b9e5cc9e29099dff Author: Marius Bakke <[email protected]> AuthorDate: Wed Aug 19 21:58:08 2026 +0200 gnu: tzdata-for-tests: Pin to a specific version. * gnu/packages/base.scm (tzdata-for-tests): Pin to 2026c. [name]: Rename to "tzdata-for-tests". * gnu/packages/glib.scm (glib-minimal)[arguments]<#:disallowed-references>: Adjust for package rename. * gnu/packages/rrdtool.scm (rrdtool)[arguments]<#:disallowed-references>: Likewise. * gnu/packages/statistics.scm (r-with-tests)[arguments]<#:disallowed-references>: Likewise. * gnu/packages/version-control.scm (gource)[arguments]<#:disallowed-references>: Likewise. * gnu/packages/perl.scm (perl-libtime-parsedate)[arguments]: Adjust comment. --- gnu/packages/base.scm | 30 +++++++++++++++++++++++++----- gnu/packages/glib.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/rrdtool.scm | 2 +- gnu/packages/statistics.scm | 3 ++- gnu/packages/version-control.scm | 3 ++- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4eb5b6ef498..a1c91e6fe56 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1722,15 +1722,35 @@ reflect changes made by political bodies to time zone boundaries, UTC offsets, and daylight-saving rules.") (license public-domain))) -;;; A "fixed" version of tzdata, which is used in the test suites of glib and R +;;; A "pinned" version of tzdata, which is used in the test suites of glib, R, ;;; and a few other places. We can update this whenever we are able to rebuild ;;; 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. -;;; -;;; Please make this a hidden-package if it is different from the primary tzdata -;;; package. -(define-public tzdata-for-tests tzdata) + +(define-public tzdata-for-tests + (hidden-package + (package + (inherit tzdata) + (name "tzdata-for-tests") + (version "2026c") + (source (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzdata"; + version ".tar.gz")) + (sha256 + (base32 + "1r1bj2fjw54yx7ki7ak1ipzzwf5afbzjh663gjkhwgbz8yj7i8g4")))) + (inputs + (list (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode"; + version ".tar.gz")) + (sha256 + (base32 + "1s5czv4d67v7h8sz1g28v9whnggchvfplbxsxz87qk2crqxgrkxi")))))))) ;; XXX: Deprecated on <2026-05-23>. (define-deprecated/public-alias tzdata/leap-seconds tzdata) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 6251ab97b72..e205220cd3b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -272,7 +272,7 @@ information, refer to the @samp{dbus-daemon(1)} man page."))) (arguments (list #:disallowed-references - (cons (this-package-native-input "tzdata") + (cons (this-package-native-input "tzdata-for-tests") ;; Verify glib-mkenums, gtester, ... use the cross-compiled ;; python. (if (%current-target-system) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 30c6dda6ab2..da0140669f8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -15293,7 +15293,7 @@ prop, vhea, vmtx and the reading and writing of all other table types.") `(;; XXX: We'd like to use #:disallowed-references 'perl-build-system' ;; doesn't support it yet. ;; - ;; #:disallowed-references (,(this-package-native-input "tzdata")) + ;; #:disallowed-references (,(this-package-native-input "tzdata-for-tests")) #:phases (modify-phases %standard-phases diff --git a/gnu/packages/rrdtool.scm b/gnu/packages/rrdtool.scm index c8739390ead..72ed8d8fec1 100644 --- a/gnu/packages/rrdtool.scm +++ b/gnu/packages/rrdtool.scm @@ -75,7 +75,7 @@ tzdata-for-tests)) (arguments (list - #:disallowed-references (list (this-package-native-input "tzdata")) + #:disallowed-references (list (this-package-native-input "tzdata-for-tests")) #:phases #~(modify-phases %standard-phases (add-before 'check 'prepare-test-environment diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 2912ba8ad5a..97966d9c1f9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -499,7 +499,8 @@ is the subpackage in charge of the statistical and diagnostics computations.") (build-system gnu-build-system) (arguments (list - #:disallowed-references `(,(this-package-native-input "tzdata")) + #:disallowed-references `(,(this-package-native-input + "tzdata-for-tests")) #:make-flags #~(list (string-append "CFLAGS=-g -O2" " -Wno-error=implicit-function-declaration") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a9522b13a79..df92ca67ded 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -4338,7 +4338,8 @@ be served with a HTTP file server of your choice.") (assoc-ref %build-inputs "boost") "/lib") "--with-tinyxml") - #:disallowed-references ,(list (this-package-native-input "tzdata")) + #:disallowed-references ,(list (this-package-native-input + "tzdata-for-tests")) #:phases (modify-phases %standard-phases (add-after 'unpack 'unbundle (lambda _
