diff options
| author | Ben Woodcroft <donttrustben@gmail.com> | 2016-07-24 10:21:21 +1000 |
|---|---|---|
| committer | Ben Woodcroft <donttrustben@gmail.com> | 2016-08-30 10:31:48 +1000 |
| commit | 520e89eb238aa814f08d6e5cd579be068aa7f302 (patch) | |
| tree | 614d35bc0cdb941be2c93bce491c2651e98803ed /gnu/packages/ruby.scm | |
| parent | 75160d4b9d5735ce3594c30f430fab6c9edbc284 (diff) | |
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'.
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 52cdef10661..46588dd0023 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm | |||
| @@ -4120,21 +4120,18 @@ call.") | |||
| 4120 | `(#:test-target "spec" | 4120 | `(#:test-target "spec" |
| 4121 | #:phases | 4121 | #:phases |
| 4122 | (modify-phases %standard-phases | 4122 | (modify-phases %standard-phases |
| 4123 | (add-before 'build 'remove-git-lsfiles-and-extra-gemspecs | 4123 | (add-before 'replace-git-ls-files 'remove-extra-gemspecs |
| 4124 | (lambda _ | ||
| 4125 | (for-each (lambda (file) | ||
| 4126 | (substitute* file | ||
| 4127 | (("git ls-files") "find * |sort"))) | ||
| 4128 | (list "concurrent-ruby.gemspec" | ||
| 4129 | "support/file_map.rb")) | ||
| 4130 | #t)) | ||
| 4131 | (add-before 'build 'remove-extra-gemspecs | ||
| 4132 | (lambda _ | 4124 | (lambda _ |
| 4133 | ;; Delete extra gemspec files so 'first-gemspec' chooses the | 4125 | ;; Delete extra gemspec files so 'first-gemspec' chooses the |
| 4134 | ;; correct one. | 4126 | ;; correct one. |
| 4135 | (delete-file "concurrent-ruby-edge.gemspec") | 4127 | (delete-file "concurrent-ruby-edge.gemspec") |
| 4136 | (delete-file "concurrent-ruby-ext.gemspec") | 4128 | (delete-file "concurrent-ruby-ext.gemspec") |
| 4137 | #t)) | 4129 | #t)) |
| 4130 | (add-before 'build 'replace-git-ls-files2 | ||
| 4131 | (lambda _ | ||
| 4132 | (substitute* "support/file_map.rb" | ||
| 4133 | (("git ls-files") "find * |sort")) | ||
| 4134 | #t)) | ||
| 4138 | (add-before 'check 'rake-compile | 4135 | (add-before 'check 'rake-compile |
| 4139 | ;; Fix the test error described at | 4136 | ;; Fix the test error described at |
| 4140 | ;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408 | 4137 | ;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408 |
