aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/ruby.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-12-09 00:18:32 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-12-09 00:18:32 +0100
commitfbb7b04a8563fbb5dfbe7b3c7be171c8dec23442 (patch)
tree5508f13c24ef19dd018cd91fe287e8fa50eda7e4 /gnu/packages/ruby.scm
parent16735b0b632b5f05fc914836b8f345e3a9e601dd (diff)
parentcec0c4e29c6efb337ae65d9c533cdbb2bf724430 (diff)
downloadpatches-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar
patches-fbb7b04a8563fbb5dfbe7b3c7be171c8dec23442.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ruby.scm')
-rw-r--r--gnu/packages/ruby.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b8fa5a3ad9..6a2eece734 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -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)