mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ruby-tzinfo-data: Remove #:guile argument in file-union call.

Browse source 
* 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:
Maxim Cournoyer 2023-04-14 21:39:00 -04:00
parent 97e37a8a79
commit cfe4a07775
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/ruby.scm
View file

@ -7038,8 +7038,7 @@ (define-public ruby-tzinfo-data
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "Rakefile" (substitute* "Rakefile"
(("https://data.iana.org/time-zones/releases") (("https://data.iana.org/time-zones/releases")
(assoc-ref inputs "tzdata"))) (assoc-ref inputs "tzdata")))))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
@ -7049,8 +7048,7 @@ (define-public ruby-tzinfo-data
((" sh\\(\\\"make -C" text) ((" sh\\(\\\"make -C" text)
(string-append " sh(\"sed -i 's@/bin/sh@sh@' #{tzdb_combined_path}/Makefile \")\n" (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))) " sh(\"sed -i 's@cc=@cc?=@' #{tzdb_combined_path}/Makefile \")\n" text)))
(setenv "cc" ,(cc-for-target)) (setenv "cc" ,(cc-for-target)))))))
#t)))))
(propagated-inputs (propagated-inputs
(list ruby-tzinfo)) (list ruby-tzinfo))
(native-inputs (native-inputs
@ -7083,14 +7081,7 @@ (define-public ruby-tzinfo-data
(uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz.asc") (uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz.asc")
(sha256 (sha256
(base32 (base32
"1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g"))))) "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)))))
(synopsis "Data from the IANA Time Zone database") (synopsis "Data from the IANA Time Zone database")
(description (description
"This library provides @code{TZInfo::Data}, which contains data from the "This library provides @code{TZInfo::Data}, which contains data from the