me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Use 'search-input-directory' when looking for tzdata.

Browse source 
* gnu/packages/backup.scm (duplicity)[arguments]: Use
'search-input-directory' for "share/zoneinfo".
* gnu/packages/bioinformatics.scm (pigx-rnaseq): Likewise.
(pigx-bsseq): Likewise.
* gnu/packages/calcurse.scm (calcurse): Likewise.
* gnu/packages/calendar.scm (date): Likewise.
* gnu/packages/compression.scm (lhasa): Likewise.
* gnu/packages/cran.scm (r-rstan): Likewise.
* gnu/packages/django.scm (python-django): Likewise.
* gnu/packages/dlang.scm (ldc-bootstrap): Likewise.
* gnu/packages/finance.scm (ledger): Likewise.
* gnu/packages/glib.scm (glib): Likewise.
* gnu/packages/golang.scm (go-1.4): Likewise.
(go-1.14): Likewise.
* gnu/packages/kde-frameworks.scm (kcalendarcore): Likewise.
(kdelibs4support): Likewise.
* gnu/packages/kodi.scm (kodi): Likewise.
* gnu/packages/mail.scm (mu): Likewise.
* gnu/packages/perl.scm (perl-libtime-parsedate): Likewise.
* gnu/packages/python-xyz.scm (python-robotframework): Likewise.
(python-dparse): Likewise.
* gnu/packages/rrdtool.scm (rrdtool): Likewise.
* gnu/packages/statistics.scm (r-with-tests): Likewise.
* gnu/packages/vim.scm (vim): Likewise.
* gnu/packages/virtualization.scm (ganeti): Likewise.
* gnu/packages/vpn.scm (strongswan): Likewise.
* gnu/packages/xfce.scm (xfce4-panel): Likewise.
* gnu/packages/mate.scm (libmateweather): Use 'search-input-file' for
"share/zoneinfo/zone.tab".
This commit is contained in:
Ludovic Courtès 2021-07-16 15:25:42 +02:00
parent 07e98fb9c4
commit 6ea7297ea4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
23 changed files with 43 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/backup.scm
View file

@ -136,8 +136,7 @@
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" (getcwd)) ; gpg needs to write to $HOME (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME
(setenv "TZDIR" ; some timestamp checks need TZDIR (setenv "TZDIR" ; some timestamp checks need TZDIR
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo"))
"/share/zoneinfo"))
;; Some things respect TMPDIR, others hard-code /tmp, and the ;; Some things respect TMPDIR, others hard-code /tmp, and the
;; defaults don't match up, breaking test_restart. Fix it. ;; defaults don't match up, breaking test_restart. Fix it.
(setenv "TMPDIR" "/tmp") (setenv "TMPDIR" "/tmp")

8
gnu/packages/bioinformatics.scm
View file

@ -10324,8 +10324,8 @@ once. This package provides tools to perform Drop-seq analyses.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC+1") (setenv "TZ" "UTC+1")
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo"))))))) "share/zoneinfo")))))))
(inputs (inputs
`(("coreutils" ,coreutils) `(("coreutils" ,coreutils)
("sed" ,sed) ("sed" ,sed)
@ -10475,8 +10475,8 @@ in an easily configurable manner.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC+1") (setenv "TZ" "UTC+1")
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo"))))))) "share/zoneinfo")))))))
(native-inputs (native-inputs
`(("tzdata" ,tzdata))) `(("tzdata" ,tzdata)))
(inputs (inputs

4
gnu/packages/calcurse.scm
View file

@ -64,8 +64,8 @@
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" ; for test/ical-007.sh (setenv "TZDIR" ; for test/ical-007.sh
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo"))))))) "share/zoneinfo")))))))
(home-page "https://www.calcurse.org") (home-page "https://www.calcurse.org")
(synopsis "Text-based calendar and scheduling") (synopsis "Text-based calendar and scheduling")
(description (description

4
gnu/packages/calendar.scm
View file

@ -96,8 +96,8 @@
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/tz.cpp" (substitute* "src/tz.cpp"
(("/usr/share/zoneinfo") (("/usr/share/zoneinfo")
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) (search-input-directory inputs
#t)) "share/zoneinfo")))))
(replace 'check (replace 'check
(lambda _ (lambda _
;; Disable test that requires checking timezone that ;; Disable test that requires checking timezone that

6
gnu/packages/compression.scm
View file

@ -544,9 +544,9 @@ than gzip and 15 % smaller output than bzip2.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'set-up-test-environment (add-before 'check 'set-up-test-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR"
"/share/zoneinfo")) (search-input-directory inputs
#t))))) "share/zoneinfo")))))))
(native-inputs (native-inputs
`(("tzdata" ,tzdata-for-tests))) `(("tzdata" ,tzdata-for-tests)))
(home-page "https://fragglet.github.com/lhasa/") (home-page "https://fragglet.github.com/lhasa/")

5
gnu/packages/cran.scm
View file

@ -24171,9 +24171,8 @@ techniques to average Bayesian predictive distributions.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC+1") (setenv "TZ" "UTC+1")
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo")) "share/zoneinfo")))))))
#t)))))
(native-inputs (native-inputs
`(("tzdata" ,tzdata-for-tests) `(("tzdata" ,tzdata-for-tests)
("pandoc" ,pandoc) ("pandoc" ,pandoc)

3
gnu/packages/django.scm
View file

@ -64,8 +64,7 @@
;; The test-suite tests timezone-dependent functions, thus tzdata ;; The test-suite tests timezone-dependent functions, thus tzdata
;; needs to be available. ;; needs to be available.
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo"))
"/share/zoneinfo"))
;; Disable test for incorrect timezone: it only raises the ;; Disable test for incorrect timezone: it only raises the
;; expected error when /usr/share/zoneinfo exists, even though ;; expected error when /usr/share/zoneinfo exists, even though

2
gnu/packages/dlang.scm
View file

@ -125,7 +125,7 @@ and freshness without requiring additional information from the user.")
(("echo") (which "echo"))) (("echo") (which "echo")))
(substitute* "runtime/phobos/std/datetime.d" (substitute* "runtime/phobos/std/datetime.d"
(("/usr/share/zoneinfo/") (("/usr/share/zoneinfo/")
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (search-input-directory inputs "share/zoneinfo"))
(("tzName == \"[+]VERSION\"") (("tzName == \"[+]VERSION\"")
"(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))"))
(substitute* "tests/d2/dmd-testsuite/Makefile" (substitute* "tests/d2/dmd-testsuite/Makefile"

4
gnu/packages/finance.scm
View file

@ -343,8 +343,8 @@ and dynamically with report tools based on filtering and graphical charts.")
;; One test fails if it can't set the timezone. ;; One test fails if it can't set the timezone.
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo")) "share/zoneinfo"))
;; Skip failing test BaselineTest_cmd-org. ;; Skip failing test BaselineTest_cmd-org.
;; This is a known upstream issue. See ;; This is a known upstream issue. See
;; https://github.com/ledger/ledger/issues/550 ;; https://github.com/ledger/ledger/issues/550

7
gnu/packages/glib.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver <mhw@netris.org>
@ -255,9 +255,8 @@ shared NFS home directories.")
(lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
;; For tests/gdatetime.c. ;; For tests/gdatetime.c.
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref (or native-inputs inputs) (search-input-directory (or native-inputs inputs)
"tzdata") "share/zoneinfo"))
"/share/zoneinfo"))
;; Some tests want write access there. ;; Some tests want write access there.
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(setenv "XDG_CACHE_HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd))

4
gnu/packages/golang.scm
View file

@ -1064,7 +1064,7 @@ your Go binary to be later served from an http.FileSystem.")
(loader (car (find-files ld "^ld-linux.+"))) (loader (car (find-files ld "^ld-linux.+")))
(net-base (assoc-ref inputs "net-base")) (net-base (assoc-ref inputs "net-base"))
(tzdata-path (tzdata-path
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (search-input-directory inputs "share/zoneinfo"))
(output (assoc-ref outputs "out"))) (output (assoc-ref outputs "out")))
;; Removing net/ tests, which fail when attempting to access ;; Removing net/ tests, which fail when attempting to access
@ -1212,7 +1212,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(loader (car (find-files ld "^ld-linux.+"))) (loader (car (find-files ld "^ld-linux.+")))
(net-base (assoc-ref inputs "net-base")) (net-base (assoc-ref inputs "net-base"))
(tzdata-path (tzdata-path
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (search-input-directory inputs "share/zoneinfo"))
(output (assoc-ref outputs "out"))) (output (assoc-ref outputs "out")))
;; Having the patch in the 'patches' field of <origin> breaks ;; Having the patch in the 'patches' field of <origin> breaks

9
gnu/packages/kde-frameworks.scm
View file

@ -451,9 +451,8 @@ GZip format, via a subclass of QIODevice.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "Europe/Prague") (setenv "TZ" "Europe/Prague")
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo")) "share/zoneinfo")))))))
#t)))))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "Library for interfacing with calendars") (synopsis "Library for interfacing with calendars")
(description "This library provides access to and handling of calendar (description "This library provides access to and handling of calendar
@ -3689,8 +3688,8 @@ workspace.")
(lambda* (#:key inputs tests? #:allow-other-keys) (lambda* (#:key inputs tests? #:allow-other-keys)
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(setenv "TZDIR" ; KDateTimeTestsome needs TZDIR (setenv "TZDIR" ; KDateTimeTestsome needs TZDIR
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo")) "share/zoneinfo"))
;; Make Qt render "offscreen", required for tests ;; Make Qt render "offscreen", required for tests
(setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_QPA_PLATFORM" "offscreen")
;; enable debug output ;; enable debug output

3
gnu/packages/kodi.scm
View file

@ -348,8 +348,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
(substitute* "xbmc/platform/linux/LinuxTimezone.cpp" (substitute* "xbmc/platform/linux/LinuxTimezone.cpp"
(("/usr/share/zoneinfo") (("/usr/share/zoneinfo")
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo")))
"/share/zoneinfo")))
;; Don't phone home to check for updates. ;; Don't phone home to check for updates.
(substitute* "system/addon-manifest.xml" (substitute* "system/addon-manifest.xml"

4
gnu/packages/mail.scm
View file

@ -1209,9 +1209,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; For mu/test/test-mu-query.c ;; For mu/test/test-mu-query.c
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo"))))
"/share/zoneinfo"))
#t))
(add-after 'install 'install-emacs-autoloads (add-after 'install 'install-emacs-autoloads
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads (emacs-generate-autoloads

4
gnu/packages/mate.scm
View file

@ -277,9 +277,7 @@ desktop and the mate-about program.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "data/check-timezones.sh" (substitute* "data/check-timezones.sh"
(("/usr/share/zoneinfo/zone.tab") (("/usr/share/zoneinfo/zone.tab")
(string-append (assoc-ref inputs "tzdata") (search-input-file inputs "/share/zoneinfo/zone.tab"))))))))
"/share/zoneinfo/zone.tab")))
#t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("intltool" ,intltool)

5
gnu/packages/perl.scm
View file

@ -11810,9 +11810,8 @@ prop, vhea, vmtx and the reading and writing of all other table types.")
;; This is needed for tests ;; This is needed for tests
(add-after 'unpack 'set-TZDIR (add-after 'unpack 'set-TZDIR
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR"
"/share/zoneinfo")) (search-input-directory inputs "share/zoneinfo")))))))
#t)))))
(native-inputs (native-inputs
`(("perl-module-build" ,perl-module-build) `(("perl-module-build" ,perl-module-build)
("tzdata" ,tzdata-for-tests))) ("tzdata" ,tzdata-for-tests)))

8
gnu/packages/python-xyz.scm
View file

@ -4310,8 +4310,7 @@ ecosystem, but can naturally be used also by other projects.")
;; ;;
;; OverflowError: mktime argument out of range ;; OverflowError: mktime argument out of range
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo"))
"/share/zoneinfo"))
(setenv "TZ" "Europe/Paris") (setenv "TZ" "Europe/Paris")
(invoke "python" "utest/run.py")))))) (invoke "python" "utest/run.py"))))))
@ -24674,9 +24673,8 @@ It adds a simple and readable way to print stuff during development.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC") (setenv "TZ" "UTC")
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo")) "share/zoneinfo")))))))
#t)))))
(home-page "https://github.com/scrapinghub/dateparser") (home-page "https://github.com/scrapinghub/dateparser")
(synopsis (synopsis
"Date parsing library designed to parse dates from HTML pages") "Date parsing library designed to parse dates from HTML pages")

4
gnu/packages/rrdtool.scm
View file

@ -73,9 +73,7 @@
(add-before 'check 'prepare-test-environment (add-before 'check 'prepare-test-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo"))))
"/share/zoneinfo"))
#t))
(add-after 'install 'remove-native-input-references (add-after 'install 'remove-native-input-references
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))

5
gnu/packages/statistics.scm
View file

@ -297,9 +297,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZ" "UTC+1") (setenv "TZ" "UTC+1")
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs
"/share/zoneinfo")) "share/zoneinfo"))))
#t))
(add-after 'build 'make-info (add-after 'build 'make-info
(lambda _ (invoke "make" "info"))) (lambda _ (invoke "make" "info")))
(add-after 'build 'install-info (add-after 'build 'install-info

3
gnu/packages/vim.scm
View file

@ -109,8 +109,7 @@
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; One of the tests tests timezone-dependent functions. ;; One of the tests tests timezone-dependent functions.
(setenv "TZDIR" (setenv "TZDIR"
(string-append (assoc-ref inputs "tzdata") (search-input-directory inputs "share/zoneinfo"))
"/share/zoneinfo"))
;; Make sure the TERM environment variable is set for the tests ;; Make sure the TERM environment variable is set for the tests
(setenv "TERM" "xterm") (setenv "TERM" "xterm")

3
gnu/packages/virtualization.scm
View file

@ -598,8 +598,7 @@ server and embedded PowerPC, and S390 guests.")
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Set TZDIR so that time zones are found. ;; Set TZDIR so that time zones are found.
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR" (search-input-directory inputs "share/zoneinfo"))
"/share/zoneinfo"))
(substitute* "test/py/ganeti.utils.process_unittest.py" (substitute* "test/py/ganeti.utils.process_unittest.py"
;; This test attempts to run an executable with ;; This test attempts to run an executable with

5
gnu/packages/vpn.scm
View file

@ -332,9 +332,8 @@ endpoints.")
#t)) #t))
(add-before 'check 'set-up-test-environment (add-before 'check 'set-up-test-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") (setenv "TZDIR"
"/share/zoneinfo")) (search-input-directory inputs "share/zoneinfo")))))
#t)))
#:configure-flags #:configure-flags
(list (list
"--disable-ldap" "--disable-ldap"

3
gnu/packages/xfce.scm
View file

@ -434,8 +434,7 @@ management D-Bus specification.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (string-append "plugins/clock/clock.c") (substitute* (string-append "plugins/clock/clock.c")
(("/usr/share/zoneinfo") (("/usr/share/zoneinfo")
(string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) (search-input-directory inputs "share/zoneinfo"))))))))
#t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("intltool" ,intltool)