From 17cfb7aeffaaba70e67e9afb50d7100614ffca7f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 5 Dec 2018 07:45:47 +0000 Subject: [PATCH] gnu: ruby-json-pure: Fix build. The version of test-unit used is greater than one of the gemspec files was specifying. It was already being changed in two places, so this commit changes the json-java.gemspec file as well. * gnu/packages/ruby.scm (ruby-json-pure)[arguments]: Add new fix-json-java.gemspec phase. --- gnu/packages/ruby.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2fde016851..52832eeeb8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3010,7 +3010,15 @@ (define-public ruby-json-pure (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\\.freeze, \\[\"~> 2\\.0\"\\]") + "%q.freeze, [\">= 2.0\"]")) + #t))))) (native-inputs `(("bundler" ,bundler) ("ragel" ,ragel)