[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
91/229: gnu: ruby-concurrent: Replace with ruby-concurrent-ruby.
From: |
guix-commits |
Subject: |
91/229: gnu: ruby-concurrent: Replace with ruby-concurrent-ruby. |
Date: |
Tue, 28 Mar 2023 22:29:07 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 2f7c92e247c85fdf0d7957c22464e4a50248f5d8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Jan 9 15:26:58 2023 -0500
gnu: ruby-concurrent: Replace with ruby-concurrent-ruby.
* 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 2d40609d7d..ffb87cd0c5 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -10403,77 +10403,6 @@ call.")
(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 @@ patterns.")
(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")
- 131/229: gnu: Add ruby-localhost., (continued)
- 131/229: gnu: Add ruby-localhost., guix-commits, 2023/03/28
- 132/229: gnu: bundler: Update to 2.4.10., guix-commits, 2023/03/28
- 133/229: gnu: ruby-puma: Update to 6.1.1 and enable test suite., guix-commits, 2023/03/28
- 74/229: gnu: Add ruby-minitest-stub-const., guix-commits, 2023/03/28
- 81/229: gnu: ruby-rack-test: Honor #:tests? argument., guix-commits, 2023/03/28
- 83/229: gnu: ruby-webrick: Update to 1.8.1., guix-commits, 2023/03/28
- 84/229: gnu: Add ruby-rackup., guix-commits, 2023/03/28
- 86/229: gnu: Add ruby-prettier-print., guix-commits, 2023/03/28
- 88/229: gnu: Add ruby-subprocess., guix-commits, 2023/03/28
- 89/229: gnu: Add ruby-rake-compiler-dock., guix-commits, 2023/03/28
- 91/229: gnu: ruby-concurrent: Replace with ruby-concurrent-ruby.,
guix-commits <=
- 92/229: gnu: Add ruby-concurrent-ruby-ext., guix-commits, 2023/03/28
- 94/229: gnu: Add ruby-sorbet-runtime., guix-commits, 2023/03/28
- 95/229: gnu: Add ruby-rdiscount., guix-commits, 2023/03/28
- 98/229: gnu: ruby-faraday: Update to 2.7.4 and enable test suite., guix-commits, 2023/03/28
- 100/229: gnu: ruby-faraday: Propagate ruby-faraday-net-http., guix-commits, 2023/03/28
- 104/229: gnu: ruby-byebug: Do not depend on ruby-chandler., guix-commits, 2023/03/28
- 106/229: gnu: Add ruby-multipart-parser., guix-commits, 2023/03/28
- 110/229: gnu: ruby-faraday-middleware: Add a deprecation comment and re-indent., guix-commits, 2023/03/28
- 121/229: gnu: Add ruby-io-console., guix-commits, 2023/03/28
- 125/229: gnu: Add ruby-rspec-debug., guix-commits, 2023/03/28