diff options
| author | Leo Famulari <leo@famulari.name> | 2016-08-29 20:55:55 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-08-29 21:03:52 -0400 |
| commit | 4b4fc92fe59833701b3a023fb4befde8196424cb (patch) | |
| tree | cc98061da62368e84f2b1a32e600e9258c24b54a /gnu/packages/ruby.scm | |
| parent | a007d699e760bea80baed64b4a3ff59351fa1801 (diff) | |
| parent | 4e9d5055fbf88ae43a7db7e901359e895fa729e8 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 52cdef1066..46588dd002 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4120,21 +4120,18 @@ call.") `(#:test-target "spec" #:phases (modify-phases %standard-phases - (add-before 'build 'remove-git-lsfiles-and-extra-gemspecs - (lambda _ - (for-each (lambda (file) - (substitute* file - (("git ls-files") "find * |sort"))) - (list "concurrent-ruby.gemspec" - "support/file_map.rb")) - #t)) - (add-before 'build 'remove-extra-gemspecs + (add-before 'replace-git-ls-files 'remove-extra-gemspecs (lambda _ ;; Delete extra gemspec files so 'first-gemspec' chooses the ;; correct one. (delete-file "concurrent-ruby-edge.gemspec") (delete-file "concurrent-ruby-ext.gemspec") #t)) + (add-before 'build 'replace-git-ls-files2 + (lambda _ + (substitute* "support/file_map.rb" + (("git ls-files") "find * |sort")) + #t)) (add-before 'check 'rake-compile ;; Fix the test error described at ;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408 |