From: Ben Woodcroft <donttrustben@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 3/3] gnu: ruby-concurrent: Adjust for 'replace-git-ls-files'.
Date: Wed, 10 Aug 2016 13:33:25 +1000 [thread overview]
Message-ID: <20160810033325.3880-4-donttrustben@gmail.com> (raw)
In-Reply-To: <20160810033325.3880-1-donttrustben@gmail.com>
* gnu/packages/ruby.scm (ruby-concurrent)[arguments]: Adjust for new build
phase 'replace-git-ls-files'.
---
gnu/packages/ruby.scm | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 0ff7d56..88bb306 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4095,21 +4095,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
--
2.9.1
prev parent reply other threads:[~2016-08-10 3:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 3:33 [PATCH 0/3]; ruby-build-system improvements Ben Woodcroft
2016-08-10 3:33 ` [PATCH 1/3] guix: ruby-build-system: Build compiled gems reproducibly Ben Woodcroft
2016-08-18 10:06 ` Ricardo Wurmus
2016-08-30 1:08 ` Ben Woodcroft
2016-08-10 3:33 ` [PATCH 2/3] guix: ruby-build-system: Add replace-git-ls-files Ben Woodcroft
2016-08-10 3:33 ` Ben Woodcroft [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160810033325.3880-4-donttrustben@gmail.com \
--to=donttrustben@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).