amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2018-12-09 00:18:32 +01:00
commit fbb7b04a85
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
84 changed files with 1059 additions and 638 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/ruby.scm
View file

@ -3029,7 +3029,15 @@ a native C extension.")
(lambda _
;; Regenerate gemspec so loosened dependency constraints are
;; propagated.
(invoke "rake" "gemspec"))))))
(invoke "rake" "gemspec")))
(add-after 'regenerate-gemspec 'fix-json-java.gemspec
(lambda _
;; This gemspec doesn't look to be generated by the above
;; command, so patch it separately.
(substitute* "json-java.gemspec"
(("%q<test-unit>\\.freeze, \\[\"~> 2\\.0\"\\]")
"%q<test-unit>.freeze, [\">= 2.0\"]"))
#t)))))
(native-inputs
`(("bundler" ,bundler)
("ragel" ,ragel)