From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Woodcroft Subject: [PATCH 3/3] gnu: ruby-concurrent: Adjust for 'replace-git-ls-files'. Date: Wed, 10 Aug 2016 13:33:25 +1000 Message-ID: <20160810033325.3880-4-donttrustben@gmail.com> References: <20160810033325.3880-1-donttrustben@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXKHF-0005XV-7w for guix-devel@gnu.org; Tue, 09 Aug 2016 23:33:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXKHB-00086A-3h for guix-devel@gnu.org; Tue, 09 Aug 2016 23:33:56 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:33413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXKHA-00085n-TU for guix-devel@gnu.org; Tue, 09 Aug 2016 23:33:53 -0400 Received: by mail-pf0-x244.google.com with SMTP id i6so1993647pfe.0 for ; Tue, 09 Aug 2016 20:33:52 -0700 (PDT) Received: from localhost.localdomain ([103.25.181.216]) by smtp.googlemail.com with ESMTPSA id r2sm28730731pal.14.2016.08.09.20.33.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 20:33:50 -0700 (PDT) In-Reply-To: <20160810033325.3880-1-donttrustben@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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