mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: ruby-tzinfo-data: Remove #:guile argument in file-union call.
* gnu/packages/ruby.scm (ruby-tzinfo-data) [arguments]: Strip trailing #t. [native-inputs]: Remove #:guile argument in file-union call.
This commit is contained in:
parent
97e37a8a79
commit
cfe4a07775
1 changed files with 3 additions and 12 deletions
|
@ -7038,8 +7038,7 @@ (define-public ruby-tzinfo-data
|
|||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "Rakefile"
|
||||
(("https://data.iana.org/time-zones/releases")
|
||||
(assoc-ref inputs "tzdata")))
|
||||
#t))
|
||||
(assoc-ref inputs "tzdata")))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
|
@ -7049,8 +7048,7 @@ (define-public ruby-tzinfo-data
|
|||
((" sh\\(\\\"make -C" text)
|
||||
(string-append " sh(\"sed -i 's@/bin/sh@sh@' #{tzdb_combined_path}/Makefile \")\n"
|
||||
" sh(\"sed -i 's@cc=@cc?=@' #{tzdb_combined_path}/Makefile \")\n" text)))
|
||||
(setenv "cc" ,(cc-for-target))
|
||||
#t)))))
|
||||
(setenv "cc" ,(cc-for-target)))))))
|
||||
(propagated-inputs
|
||||
(list ruby-tzinfo))
|
||||
(native-inputs
|
||||
|
@ -7083,14 +7081,7 @@ (define-public ruby-tzinfo-data
|
|||
(uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz.asc")
|
||||
(sha256
|
||||
(base32
|
||||
"1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g")))))
|
||||
|
||||
;; XXX: Explicitly depend on 'guile-final', which was previously
|
||||
;; implied via the '%guile-for-build' fluid but not explicit.
|
||||
;; TODO: Remove this argument on the next rebuild cycle.
|
||||
#:guile (module-ref (resolve-interface
|
||||
'(gnu packages commencement))
|
||||
'guile-final)))))
|
||||
"1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g")))))))))
|
||||
(synopsis "Data from the IANA Time Zone database")
|
||||
(description
|
||||
"This library provides @code{TZInfo::Data}, which contains data from the
|
||||
|
|
Loading…
Reference in a new issue