[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62196] [PATCH 091/223] gnu: ruby-concurrent: Replace with ruby-conc
From: |
Maxim Cournoyer |
Subject: |
[bug#62196] [PATCH 091/223] gnu: ruby-concurrent: Replace with ruby-concurrent-ruby. |
Date: |
Mon, 20 Mar 2023 13:14:23 -0400 |
* gnu/packages/ruby.scm (ruby-concurrent): Delete package, and define it as a
deprecated alias to ruby-concurrent-ruby instead.
---
gnu/packages/ruby.scm | 77 ++++---------------------------------------
1 file changed, 6 insertions(+), 71 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index a1a4521805..a5539808a1 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -10403,77 +10403,6 @@ (define-public ruby-timecop
(home-page "https://github.com/travisjeffery/timecop")
(license license:expat)))
-(define-public ruby-concurrent
- (package
- (name "ruby-concurrent")
- (version "1.1.5")
- (source
- (origin
- (method git-fetch)
- ;; Download from GitHub because the rubygems version does not contain
- ;; Rakefile.
- (uri (git-reference
- (url "https://github.com/ruby-concurrency/concurrent-ruby")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "193q2k47vk7qdvv9hlhmmdxgy91xl4imapyk1ijdg9vgf46knyzj"))))
- (build-system ruby-build-system)
- (arguments
- `(#:test-target "ci"
- #:phases
- (modify-phases %standard-phases
- (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))
- (replace 'replace-git-ls-files
- (lambda _
- ;; 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 'remove-timecop-dependency
- ;; Remove timecop-dependent tests as having timecop as a depedency
- ;; causes circular depedencies.
- (lambda _
- (delete-file "spec/concurrent/executor/timer_set_spec.rb")
- (delete-file "spec/concurrent/scheduled_task_spec.rb")
- #t)))))
- (native-inputs
- (list ruby-rake-compiler ruby-rspec))
- (synopsis "Concurrency tools for Ruby")
- (description
- "This library provides modern concurrency tools including agents,
-futures, promises, thread pools, actors, supervisors, and more. It is
-inspired by Erlang, Clojure, Go, JavaScript, actors and classic concurrency
-patterns.")
- (home-page "http://www.concurrent-ruby.com")
- (license license:expat)))
-
(define-public ruby-concurrent-ruby
(package
(name "ruby-concurrent-ruby")
@@ -10512,6 +10441,12 @@ (define-public ruby-concurrent-ruby
(home-page "https://github.com/ruby-concurrency/concurrent-ruby")
(license license:expat)))
+;;; The 'gem' is called 'concurrent-ruby'; reversing its name was confusing
+;;; and failed to be picked by the gem importer (which led to this newer
+;;; package).
+(define-public ruby-concurrent
+ (deprecated-package "ruby-concurrent" ruby-concurrent-ruby))
+
(define-public ruby-pkg-config
(package
(name "ruby-pkg-config")
--
2.39.1
- [bug#62196] [PATCH 030/223] gnu: Add ruby-m., (continued)
- [bug#62196] [PATCH 030/223] gnu: Add ruby-m., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 033/223] gnu: ruby-standard: Relax requirements., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 037/223] gnu: Add ruby-hiredis., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 040/223] gnu: Add ruby-cucumber-compatibility-kit., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 042/223] gnu: Remove ruby-protobuf-cucumber., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 082/223] gnu: ruby-sinatra: Update to 3.0.5., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 076/223] gnu: ruby-rack: Update home page URL., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 092/223] gnu: Add ruby-concurrent-ruby-ext., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 086/223] gnu: Add ruby-prettier-print., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 093/223] gnu: Add ruby-concurrent-ruby-edge., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 091/223] gnu: ruby-concurrent: Replace with ruby-concurrent-ruby.,
Maxim Cournoyer <=
- [bug#62196] [PATCH 098/223] gnu: ruby-faraday: Update to 2.7.4 and enable test suite., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 034/223] gnu: Add ruby-dotenv., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 038/223] gnu: ruby-minitest-5.14: Update to 5.15.0., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 041/223] gnu: ruby-cucumber-messages: Update to 21.0.1., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 027/223] gnu: ruby-rubocop: Update to 1.48.1, Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 043/223] gnu: ruby-cucumber-tag-expressions: Update to 5.0.1, fixing build., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 044/223] gnu: ruby-cucumber-core: Update to 11.1.0., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 073/223] gnu: ruby-puma: Build with SSL support., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 080/223] gnu: ruby-rack-test: Update home page., Maxim Cournoyer, 2023/03/20
- [bug#62196] [PATCH 081/223] gnu: ruby-rack-test: Honor #:tests? argument., Maxim Cournoyer, 2023/03/20