me
/
guix
Archived
1
0
Fork 0

gnu: Add a tzdata variant for testing purposes.

* gnu/packages/base.scm (tzdata-2017a): New variable.
* gnu/packages/glib.scm (glib)[inputs]: Remove tzdata.
[native-inputs]: Add tzdata-2017a.
[arguments]: Add tzdata-2017a to #:disallowed-references.
* gnu/packages/statistics.scm (r)[inputs]: Remove tzdata.
[native-inputs]: Add tzdata-2017a.
[arguments]: Add tzdata-2017a to #:disallowed-references.
master
Leo Famulari 2017-03-08 18:03:38 -05:00
parent e4d34cd0f0
commit 3ffaec136f
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
3 changed files with 33 additions and 6 deletions

View File

@ -1044,6 +1044,31 @@ reflect changes made by political bodies to time zone boundaries, UTC offsets,
and daylight-saving rules.") and daylight-saving rules.")
(license public-domain))) (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 (define-public libiconv
(package (package
(name "libiconv") (name "libiconv")

View File

@ -157,17 +157,18 @@ shared NFS home directories.")
`(("coreutils" ,coreutils) `(("coreutils" ,coreutils)
("util-linux" ,util-linux) ; for libmount ("util-linux" ,util-linux) ; for libmount
("libffi" ,libffi) ("libffi" ,libffi)
("zlib" ,zlib) ("zlib" ,zlib)))
("tzdata" ,tzdata))) ; for tests/gdatetime.c
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
("dbus" ,dbus) ; for GDBus tests ("dbus" ,dbus) ; for GDBus tests
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-wrapper) ("python" ,python-wrapper)
("perl" ,perl) ; needed by GIO tests ("perl" ,perl) ; needed by GIO tests
("bash" ,bash))) ("bash" ,bash)
("tzdata" ,tzdata-2017a))) ; for tests/gdatetime.c
(arguments (arguments
'(#:phases `(#:disallowed-references (,tzdata-2017a)
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'pre-build (add-before 'build 'pre-build
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)

View File

@ -113,7 +113,8 @@ be output in text, PostScript, PDF or HTML.")
"0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss")))) "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:disallowed-references (,tzdata-2017a)
#:make-flags
(list (string-append "LDFLAGS=-Wl,-rpath=" (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/R/lib") "/lib/R/lib")
@ -187,6 +188,7 @@ be output in text, PostScript, PDF or HTML.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ; for building HTML manuals ("texinfo" ,texinfo) ; for building HTML manuals
("which" ,which) ; for tests/Examples/base-Ex.R ("which" ,which) ; for tests/Examples/base-Ex.R
("tzdata" ,tzdata-2017a)
("xz" ,xz))) ("xz" ,xz)))
(inputs (inputs
`(;; We need not only cairo here, but pango to ensure that tests for the `(;; 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) ("pango" ,pango)
("coreutils" ,coreutils) ("coreutils" ,coreutils)
("curl" ,curl) ("curl" ,curl)
("tzdata" ,tzdata)
("openblas" ,openblas) ("openblas" ,openblas)
("gfortran" ,gfortran) ("gfortran" ,gfortran)
("icu4c" ,icu4c) ("icu4c" ,icu4c)