From 5a8ef3c127b21251bb1d3aae144a01682179e40d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 16 Apr 2020 14:17:25 -0400 Subject: [PATCH] gnu: Use the test-only time zone database where appropriate. * gnu/packages/backup.scm (duplicity)[inputs]: Remove tzdata. [native-inputs]: Add tzdata-for-tests. * gnu/packages/finance.scm (ledger): Likewise. * gnu/packages/compression.scm (lhasa)[native-inputs]: Use tzdata-for-tests. * gnu/packages/cran.scm (r-rstan)[native-inputs]: Likewise. * gnu/packages/databases.scm (mongodb)[native-inputs]: Likewise. * gnu/packages/kde-frameworks.scm (kdelibs4support)[native-inputs]: Likewise. --- gnu/packages/backup.scm | 4 ++-- gnu/packages/compression.scm | 2 +- gnu/packages/cran.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/finance.scm | 4 ++-- gnu/packages/kde-frameworks.scm | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 223c393b6d..d80359f8f1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -91,6 +91,7 @@ (define-public duplicity ("par2cmdline" ,par2cmdline) ("python-pexpect" ,python2-pexpect) ("python-fasteners" ,python2-fasteners) + ("tzdata" ,tzdata-for-tests) ("mock" ,python2-mock))) (propagated-inputs `(("lockfile" ,python2-lockfile) @@ -99,8 +100,7 @@ (define-public duplicity `(("librsync" ,librsync-0.9) ("lftp" ,lftp) ("gnupg" ,gnupg) ; gpg executable needed - ("util-linux" ,util-linux) ; for setsid - ("tzdata" ,tzdata))) + ("util-linux" ,util-linux))) ; for setsid (arguments `(#:python ,python-2 ; setup assumes Python 2 #:test-target "test" diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2e1fe04dde..67e3b880f6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -489,7 +489,7 @@ (define-public lhasa "/share/zoneinfo")) #t))))) (native-inputs - `(("tzdata" ,tzdata))) + `(("tzdata" ,tzdata-for-tests))) (home-page "https://fragglet.github.com/lhasa/") (synopsis "LHA archive decompressor") (description "Lhasa is a replacement for the Unix LHA tool, for diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3917545422..757f809941 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20624,7 +20624,7 @@ (define-public r-rstan "/share/zoneinfo")) #t))))) (native-inputs - `(("tzdata" ,tzdata) + `(("tzdata" ,tzdata-for-tests) ("pandoc" ,ghc-pandoc))) (propagated-inputs `(("r-bh" ,r-bh) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a6f78154e8..7ca2ca37a3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -508,7 +508,7 @@ (define-public mongodb ("python" ,python-2) ("python2-pymongo" ,python2-pymongo) ("python2-pyyaml" ,python2-pyyaml) - ("tzdata" ,tzdata))) + ("tzdata" ,tzdata-for-tests))) (arguments `(#:scons ,scons-python2 #:phases diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index a78488615d..ee254c3a9f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -241,11 +241,11 @@ (define-public ledger ("libedit" ,libedit) ("mpfr" ,mpfr) ("python" ,python-2) - ("tzdata" ,tzdata) ("utfcpp" ,utfcpp))) (native-inputs `(("groff" ,groff) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("tzdata" ,tzdata-for-tests))) (home-page "https://ledger-cli.org/") (synopsis "Command-line double-entry accounting program") (description diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index a586b26d7e..dad50fad24 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -3537,7 +3537,7 @@ (define-public kdelibs4support ("shared-mime-info" ,shared-mime-info) ("kjobwidgets" ,kjobwidgets) ;; required for running the tests ("strace" ,strace) - ("tzdata" ,tzdata))) + ("tzdata" ,tzdata-for-tests))) (propagated-inputs ;; These are required to be installed along with this package, see ;; lib64/cmake/KF5KDELibs4Support/KF5KDELibs4SupportConfig.cmake