aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Woodcroft <donttrustben@gmail.com>2016-07-24 10:21:21 +1000
committerBen Woodcroft <donttrustben@gmail.com>2016-08-30 10:31:48 +1000
commit520e89eb238aa814f08d6e5cd579be068aa7f302 (patch)
tree614d35bc0cdb941be2c93bce491c2651e98803ed
parent75160d4b9d5735ce3594c30f430fab6c9edbc284 (diff)
downloadpatches-520e89eb238aa814f08d6e5cd579be068aa7f302.tar
patches-520e89eb238aa814f08d6e5cd579be068aa7f302.tar.gz
gnu: ruby-concurrent: Adjust for 'replace-git-ls-files'.
* gnu/packages/ruby.scm (ruby-concurrent)[arguments]: Adjust for new build phase 'replace-git-ls-files'.
-rw-r--r--gnu/packages/ruby.scm15
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