aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/base.scm25
-rw-r--r--gnu/packages/glib.scm9
-rw-r--r--gnu/packages/statistics.scm5
3 files changed, 33 insertions, 6 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c452385a90..ba9c820efa 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1044,6 +1044,31 @@ 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. We can update this whenever we are able to rebuild
+;;; thousands of packages (for example, in a core-updates rebuild).
+(define-public tzdata-2017a
+ (package
+ (inherit tzdata)
+ (version "2017a")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.iana.org/time-zones/repository"
+ "/releases/tzdata" version ".tar.gz"))
+ (sha256
+ (base32
+ "1mmv4rvcs12lrvgghw4fidczvb69yv69cmzknghcvw1c196mqfnz"))))
+ (inputs `(("tzcode" ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.iana.org/time-zones/repository/releases/tzcode"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1b1q7gnlsh5hjgs5065pvajd37rmbc3k9b8cgzad1vcrifswdwh2"))))))))
+
+
(define-public libiconv
(package
(name "libiconv")
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 45f4631f9f..6de9cce0b7 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -157,17 +157,18 @@ shared NFS home directories.")
`(("coreutils" ,coreutils)
("util-linux" ,util-linux) ; for libmount
("libffi" ,libffi)
- ("zlib" ,zlib)
- ("tzdata" ,tzdata))) ; for tests/gdatetime.c
+ ("zlib" ,zlib)))
(native-inputs
`(("gettext" ,gettext-minimal)
("dbus" ,dbus) ; for GDBus tests
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("perl" ,perl) ; needed by GIO tests
- ("bash" ,bash)))
+ ("bash" ,bash)
+ ("tzdata" ,tzdata-2017a))) ; for tests/gdatetime.c
(arguments
- '(#:phases
+ `(#:disallowed-references (,tzdata-2017a)
+ #:phases
(modify-phases %standard-phases
(add-before 'build 'pre-build
(lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index e02c342c6f..64b0b0e940 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -113,7 +113,8 @@ be output in text, PostScript, PDF or HTML.")
"0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags
+ `(#:disallowed-references (,tzdata-2017a)
+ #:make-flags
(list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib/R/lib")
@@ -187,6 +188,7 @@ be output in text, PostScript, PDF or HTML.")
("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; for building HTML manuals
("which" ,which) ; for tests/Examples/base-Ex.R
+ ("tzdata" ,tzdata-2017a)
("xz" ,xz)))
(inputs
`(;; We need not only cairo here, but pango to ensure that tests for the
@@ -194,7 +196,6 @@ be output in text, PostScript, PDF or HTML.")
("pango" ,pango)
("coreutils" ,coreutils)
("curl" ,curl)
- ("tzdata" ,tzdata)
("openblas" ,openblas)
("gfortran" ,gfortran)
("icu4c" ,icu4c)