diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-08 18:03:38 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-12 20:45:46 -0400 |
| commit | 3ffaec136fab017e6cc094287da207cf30f05974 (patch) | |
| tree | e8cb957e8937c25f7c37b23420466fb343d65ddc /gnu/packages/statistics.scm | |
| parent | e4d34cd0f0ced54210ed2df2b251430a9c98c6f4 (diff) | |
| download | guix-patches-3ffaec136fab017e6cc094287da207cf30f05974.tar guix-patches-3ffaec136fab017e6cc094287da207cf30f05974.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/statistics.scm')
| -rw-r--r-- | gnu/packages/statistics.scm | 5 |
1 files changed, 3 insertions, 2 deletions
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) |