guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: ruby-json-pure: Fix build.


From: guix-commits
Subject: 01/01: gnu: ruby-json-pure: Fix build.
Date: Wed, 5 Dec 2018 16:21:38 -0500 (EST)

cbaines pushed a commit to branch master
in repository guix.

commit 17cfb7aeffaaba70e67e9afb50d7100614ffca7f
Author: Christopher Baines <address@hidden>
Date:   Wed Dec 5 07:45:47 2018 +0000

    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 2fde016..52832ee 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3010,7 +3010,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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]