amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ruby-concurrent: Update to 1.1.5.

Browse source 
* gnu/packages/patches/ruby-concurrent-ignore-broken-test.patch,
gnu/packages/patches/ruby-concurrent-test-arm.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/ruby.scm (ruby-concurrent): Update to 1.1.5.
[source](patches): Remove.
[arguments]: Set #:test-target to "ci".  Remove obsolete phases.  Remove
dependencies on 'rake_compiler_dock' and concurrent_ruby.jar.
This commit is contained in:
Marius Bakke 2019-10-14 20:52:28 +02:00
parent 8fcba3be28
commit 1007640a63
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
4 changed files with 27 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

42
gnu/packages/ruby.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
@ -7170,7 +7170,7 @@ call.")
(define-public ruby-concurrent
(package
(name "ruby-concurrent")
(version "1.0.5")
(version "1.1.5")
(source
(origin
(method git-fetch)
@ -7182,14 +7182,10 @@ call.")
(file-name (git-file-name name version))
(sha256
(base32
"1618ald6mhz86hapgw9hs3cvb518k48fk6fxficdrdg3zcx8n302"))
;; Exclude failing test reported at
;; https://github.com/ruby-concurrency/concurrent-ruby/issues/534
(patches (search-patches "ruby-concurrent-ignore-broken-test.patch"
"ruby-concurrent-test-arm.patch"))))
"193q2k47vk7qdvv9hlhmmdxgy91xl4imapyk1ijdg9vgf46knyzj"))))
(build-system ruby-build-system)
(arguments
`(#:test-target "spec"
`(#:test-target "ci"
#:phases
(modify-phases %standard-phases
(add-before 'replace-git-ls-files 'remove-extra-gemspecs
@ -7199,15 +7195,31 @@ call.")
(delete-file "concurrent-ruby-edge.gemspec")
(delete-file "concurrent-ruby-ext.gemspec")
#t))
(add-before 'build 'replace-git-ls-files2
(replace 'replace-git-ls-files
(lambda _
(substitute* "support/file_map.rb"
(("git ls-files") "find * |sort"))
;; XXX: The default substitution made by this phase is not fully
;; compatible with "git ls-files". The latter produces file names
;; such as "lib/foo", whereas ruby-build-system uses "find . [...]"
;; which gives "./lib/foo". That difference in turn breaks the
;; comparison against a glob pattern in this script.
(substitute* "concurrent-ruby.gemspec"
(("git ls-files") "find * -type f | sort"))
#t))
(add-before 'build 'remove-jar-from-gemspec
(lambda _
;; The gemspec wants to include a JAR file that we do not build
;; nor need.
(substitute* "concurrent-ruby.gemspec"
(("'lib/concurrent/concurrent_ruby.jar'")
""))
#t))
(add-before 'build 'remove-rake_compiler_dock-dependency
(lambda _
;; This library is only used when building for non-MRI targets.
(substitute* "Rakefile"
(("require 'rake_compiler_dock'")
""))
#t))
(add-before 'check 'rake-compile
;; Fix the test error described at
;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408
(lambda _ (invoke "rake" "compile")))
(add-before 'check 'remove-timecop-dependency
;; Remove timecop-dependent tests as having timecop as a depedency
;; causes circular depedencies.