* [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby.
@ 2023-06-18 11:23 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 01/24] gnu: texlive-hyphen-package: Explicitly use ruby-2.7 Christopher Baines
` (24 more replies)
0 siblings, 25 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:23 UTC (permalink / raw)
To: 64150
[-- Attachment #1: Type: text/plain, Size: 1771 bytes --]
I'm looking at updating the default ruby, and these changes update some
packages that might break, plus explicitly using ruby-2.7 in places to
reduce the dependencies on ruby.
Christopher Baines (24):
gnu: texlive-hyphen-package: Explicitly use ruby-2.7.
gnu: texlive-hyph-utf8: Explicitly use ruby-2.7.
gnu: texlive-bin: Explicitly use ruby-2.7.
gnu: qtbase: Explicitly use ruby-2.7.
gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal.
gnu: qtwebengine-5: Explicitly use ruby-2.7.
gnu: utf8proc-2.7.0: Explicitly use ruby-2.7.
gnu: webkitgtk: Explicitly use ruby-2.
gnu: mkvtoolnix: Explicitly use ruby-2.7.
gnu: ruby-yajl-ruby: Update to 1.4.3.
gnu: ruby-tzinfo: Update to 2.0.6.
gnu: ruby-test-unit: Update to 3.6.0.
gnu: ruby-sucker-punch: Update to 3.1.0.
gnu: ruby-shindo: Update to 0.3.10.
gnu: ruby-rjb: Update to 1.6.7.
gnu: ruby-range-compressor: Update to 1.2.0.
gnu: ruby-pry-doc: Update to 1.4.0.
gnu: ruby-powerpack: Update to 0.1.3.
gnu: ruby-mkmf-lite: Update to 0.5.2.
gnu: ruby-memory-profiler: Update to 1.0.1.
gnu: ruby-hocon: Update to 1.4.0.
gnu: ruby-debug-inspector: Update to 1.1.0.
gnu: ruby-commander: Update to 4.6.0.
gnu: bioruby: Update to 2.0.4.
gnu/packages/bioinformatics.scm | 32 ++---
gnu/packages/qt.scm | 4 +-
gnu/packages/rails.scm | 25 ++--
gnu/packages/ruby.scm | 231 ++++++++++++++++++--------------
gnu/packages/tex.scm | 6 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/video.scm | 2 +-
gnu/packages/webkit.scm | 2 +-
8 files changed, 165 insertions(+), 139 deletions(-)
base-commit: e4087930f3ad60918689be5f4bca4ce3e22429f5
--
2.40.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 01/24] gnu: texlive-hyphen-package: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 02/24] gnu: texlive-hyph-utf8: " Christopher Baines
` (23 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines, Ricardo Wurmus
As Ruby 3 looks to cause issues.
* gnu/packages/tex.scm (texlive-hyphen-package)[native-inputs]: Explicitly use
ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/tex.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index b55dd2a5fd..e01f33304d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -236,7 +236,7 @@ (define (texlive-hyphen-package name code locations hash)
(string-append "File.join(\"" ptex "\"")))
(invoke "ruby" "generate-ptex-patterns.rb")))))))))
(native-inputs
- (list ruby ruby-hydra-minimal hyph-utf8-scripts))
+ (list ruby-2.7 ruby-hydra-minimal hyph-utf8-scripts))
(home-page "https://ctan.org/pkg/hyph-utf8"))))
(define texlive-extra-src
base-commit: e4087930f3ad60918689be5f4bca4ce3e22429f5
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 02/24] gnu: texlive-hyph-utf8: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 01/24] gnu: texlive-hyphen-package: Explicitly use ruby-2.7 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 03/24] gnu: texlive-bin: " Christopher Baines
` (22 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines, Ricardo Wurmus
As Ruby 3 looks to cause issues.
* gnu/packages/tex.scm (texlive-hyph-utf8)[native-inputs]: Explicitly use
ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/tex.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e01f33304d..537d63a3ba 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2763,7 +2763,7 @@ (define-public texlive-hyph-utf8
(string-append out "/share/texmf-dist/tex/luatex/hyph-utf8/")))
#t)))))
(native-inputs
- (list ruby
+ (list ruby-2.7
texlive-bin
;; The following packages are needed for build "tex.fmt", which we need
;; for a working "tex".
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 03/24] gnu: texlive-bin: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 01/24] gnu: texlive-hyphen-package: Explicitly use ruby-2.7 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 02/24] gnu: texlive-hyph-utf8: " Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 04/24] gnu: qtbase: " Christopher Baines
` (21 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines, Ricardo Wurmus
To enable changing ruby without affecting texlive-bin.
* gnu/packages/tex.scm (texlive-bin)[inputs]: Explicitly use ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/tex.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 537d63a3ba..6c055ed0cd 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -316,7 +316,7 @@ (define-public texlive-bin
("pixman" ,pixman)
("potrace" ,potrace)
("python" ,python)
- ("ruby" ,ruby)
+ ("ruby" ,ruby-2.7)
("tcsh" ,tcsh)
("teckit" ,teckit)
("zlib" ,zlib)
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 04/24] gnu: qtbase: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (2 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 03/24] gnu: texlive-bin: " Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 05/24] gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal Christopher Baines
` (20 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines, Andreas Enge, 宋文武
To avoid changing qabase-5 while changing ruby.
* gnu/packages/qt.scm (qtbase-5)[native-inputs]: Explicitly use ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/qt.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1e5d29d9cf..fca02e4a20 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -419,7 +419,7 @@ (define-public qtbase-5
pkg-config
python
vulkan-headers
- ruby))
+ ruby-2.7))
(arguments
`(#:configure-flags
(let ((out (assoc-ref %outputs "out")))
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 05/24] gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (3 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 04/24] gnu: qtbase: " Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 06/24] gnu: qtwebengine-5: Explicitly use ruby-2.7 Christopher Baines
` (19 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines, Christopher Baines, Ricardo Wurmus
To allow updating ruby without changing texlive.
* gnu/packages/ruby.scm (ruby-hydra-minimal/pinned): New variable.
* gnu/packages/tex.scm (texlive-hyphen-package)[native-inputs]: Use it
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/ruby.scm | 9 +++++++++
gnu/packages/tex.scm | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index f28ad97e11..1de1d634bc 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3597,6 +3597,15 @@ (define-public ruby-hydra-minimal
It is a low-dependency variant of ruby-hydra.")
(license license:expat))))
+;; Pinned variant for use by texlive
+(define-public ruby-hydra-minimal/pinned
+ (hidden-package
+ (package
+ (inherit ruby-hydra-minimal)
+ (arguments
+ (cons* #:ruby ruby-2.7
+ (package-arguments ruby-hydra-minimal))))))
+
(define-public ruby-hydra
(package
(inherit ruby-hydra-minimal)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 6c055ed0cd..65f8d901d7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -236,7 +236,7 @@ (define (texlive-hyphen-package name code locations hash)
(string-append "File.join(\"" ptex "\"")))
(invoke "ruby" "generate-ptex-patterns.rb")))))))))
(native-inputs
- (list ruby-2.7 ruby-hydra-minimal hyph-utf8-scripts))
+ (list ruby-2.7 ruby-hydra-minimal/pinned hyph-utf8-scripts))
(home-page "https://ctan.org/pkg/hyph-utf8"))))
(define texlive-extra-src
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 06/24] gnu: qtwebengine-5: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (4 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 05/24] gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 07/24] gnu: utf8proc-2.7.0: " Christopher Baines
` (18 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines, Andreas Enge, 宋文武
So that ruby can change without affecting this package and it's dependents.
* gnu/packages/qt.scm (qtwebengine-5)[native-inputs]: Explicitly use ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/qt.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fca02e4a20..de070ecaf3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2643,7 +2643,7 @@ (define-public qtwebengine-5
pkg-config
python2-six
python-2
- ruby))
+ ruby-2.7))
(inputs
(list alsa-lib
at-spi2-core
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 07/24] gnu: utf8proc-2.7.0: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (5 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 06/24] gnu: qtwebengine-5: Explicitly use ruby-2.7 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2 Christopher Baines
` (17 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
So that ruby can change without affecting this package and it's julia related
dependents.
* gnu/packages/textutils.scm (utf8proc-2.7.0)[native-inputs]: Explicitly use
ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/textutils.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 026264dc27..ba33cf7de7 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -249,7 +249,7 @@ (define-public utf8proc-2.7.0
(sha256
(base32 "1g77s8g9443dd92f82pbkim7rk51s7xdwa3mxpzb1lcw8ryxvvg3"))))
;; For tests
- ("ruby" ,ruby)))))))
+ ("ruby" ,ruby-2.7)))))))
(define-public libconfuse
(package
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (6 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 07/24] gnu: utf8proc-2.7.0: " Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:35 ` Liliana Marie Prikler
2023-06-18 11:28 ` [bug#64150] [PATCH 09/24] gnu: mkvtoolnix: Explicitly use ruby-2.7 Christopher Baines
` (16 subsequent siblings)
24 siblings, 1 reply; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150
Cc: Christopher Baines, Liliana Marie Prikler, Maxim Cournoyer,
Raghav Gururajan
So that ruby can change without affecting this package and its dependants.
* gnu/packages/webkit.scm (webkitgtk)[native-inputs]: Explicitly use ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/webkit.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index f1b810adbd..5ab93ad9eb 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -222,7 +222,7 @@ (define-public webkitgtk
pkg-config
python-wrapper
gi-docgen
- ruby
+ ruby-2.7
unifdef))
(propagated-inputs
(list gtk+ libsoup))
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 09/24] gnu: mkvtoolnix: Explicitly use ruby-2.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (7 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 10/24] gnu: ruby-yajl-ruby: Update to 1.4.3 Christopher Baines
` (15 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
To allow updating ruby without affecting this package.
* gnu/packages/video.scm (mkvtoolnix)[native-inputs]: Explicitly use ruby-2.7.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/video.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 66e6cb5408..908155755e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1035,7 +1035,7 @@ (define-public mkvtoolnix
("pkg-config" ,pkg-config)
("po4a" ,po4a)
("qttools-5" ,qttools-5)
- ("ruby" ,ruby)))
+ ("ruby" ,ruby-2.7)))
(arguments
`(#:configure-flags
(list (string-append "--with-boost="
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 10/24] gnu: ruby-yajl-ruby: Update to 1.4.3.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (8 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 09/24] gnu: mkvtoolnix: Explicitly use ruby-2.7 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 11/24] gnu: ruby-tzinfo: Update to 2.0.6 Christopher Baines
` (14 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-yajl-ruby): Update to 1.4.3.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 1de1d634bc..f24c709280 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -9842,25 +9842,25 @@ (define-public ruby-bio-logger
(define-public ruby-yajl-ruby
(package
(name "ruby-yajl-ruby")
- (version "1.4.1")
+ (version "1.4.3")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "yajl-ruby" version))
(sha256
(base32
- "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"))))
+ "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc"))))
(build-system ruby-build-system)
(arguments
- '(#:test-target "spec"
- #:phases
- (modify-phases %standard-phases
- (add-before 'check 'patch-test-to-update-load-path
- (lambda _
- (substitute* "spec/parsing/large_number_spec.rb"
- (("require \"yajl\"")
- "$LOAD_PATH << 'lib'; require 'yajl'"))
- #t)))))
+ (list
+ #:test-target "spec"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'patch-test-to-update-load-path
+ (lambda _
+ (substitute* "spec/parsing/large_number_spec.rb"
+ (("require \"yajl\"")
+ "$LOAD_PATH << 'lib'; require 'yajl'")))))))
(native-inputs
(list ruby-rake-compiler ruby-rspec))
(synopsis "Streaming JSON parsing and encoding library for Ruby")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 11/24] gnu: ruby-tzinfo: Update to 2.0.6.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (9 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 10/24] gnu: ruby-yajl-ruby: Update to 1.4.3 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 12/24] gnu: ruby-test-unit: Update to 3.6.0 Christopher Baines
` (13 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-tzinfo): Update to 2.0.6.
[arguments,propagated-inputs]: Update style.
---
gnu/packages/ruby.scm | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index f24c709280..1dce3dc315 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7011,7 +7011,7 @@ (define-public ruby-thread-safe
(define-public ruby-tzinfo
(package
(name "ruby-tzinfo")
- (version "2.0.4")
+ (version "2.0.6")
(source
(origin
(method git-fetch)
@@ -7022,31 +7022,29 @@ (define-public ruby-tzinfo
(file-name (git-file-name name version))
(sha256
(base32
- "0jaq1givdaz5jxz47xngyj3j315n872rk97mnpm5njwm48wy45yh"))))
+ "1n1gzjqwwnx209h8d054miva0y7x17db2ahy7jav5r25ibhh7rgm"))))
(build-system ruby-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-safe-tests
- (lambda _
- (substitute* "test/test_utils.rb"
- (("def safe_test\\(options = \\{\\}\\)")
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-safe-tests
+ (lambda _
+ (substitute* "test/test_utils.rb"
+ (("def safe_test\\(options = \\{\\}\\)")
"def safe_test(options = {})
- skip('The Guix build environment has an unsafe load path')"))
- #t))
- (add-before 'check 'pre-check
- (lambda _
- (setenv "HOME" (getcwd))
- (substitute* "Gemfile"
- (("simplecov.*") "simplecov'\n"))
- #t))
- (replace 'check
- (lambda* (#:key tests? test-target #:allow-other-keys)
- (when tests?
- (invoke "bundler" "exec" "rake" test-target))
- #t)))))
+ skip('The Guix build environment has an unsafe load path')"))))
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" (getcwd))
+ (substitute* "Gemfile"
+ (("simplecov.*") "simplecov'\n"))))
+ (replace 'check
+ (lambda* (#:key tests? test-target #:allow-other-keys)
+ (when tests?
+ (invoke "bundler" "exec" "rake" test-target)))))))
(propagated-inputs
- `(("ruby-concurrent-ruby" ,ruby-concurrent)))
+ (list ruby-concurrent))
(native-inputs
(list ruby-simplecov))
(synopsis "Time zone library for Ruby")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 12/24] gnu: ruby-test-unit: Update to 3.6.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (10 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 11/24] gnu: ruby-tzinfo: Update to 2.0.6 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 13/24] gnu: ruby-sucker-punch: Update to 3.1.0 Christopher Baines
` (12 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-test-unit): Update to 3.6.0.
[source]: Switch to Git as tests missing from gem.
---
gnu/packages/ruby.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 1dce3dc315..d411d643ae 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4553,13 +4553,16 @@ (define-public ruby-test-construct
(define-public ruby-test-unit
(package
(name "ruby-test-unit")
- (version "3.4.4")
+ (version "3.6.0")
(source (origin
- (method url-fetch)
- (uri (rubygems-uri "test-unit" version))
+ (method git-fetch) ;for tests
+ (uri (git-reference
+ (url "https://github.com/test-unit/test-unit")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "15isy7vhppbfd0032klirj9gxp65ygkzjdwrmm28xpirlcsk6qpd"))))
+ "0w1m432q3y5v9lkak8yyxadak3z17bsp6afni97i4zjdgfz7niz2"))))
(build-system ruby-build-system)
(propagated-inputs
(list ruby-power-assert))
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 13/24] gnu: ruby-sucker-punch: Update to 3.1.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (11 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 12/24] gnu: ruby-test-unit: Update to 3.6.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 14/24] gnu: ruby-shindo: Update to 0.3.10 Christopher Baines
` (11 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-sucker-punch): Update to 3.1.0.
---
gnu/packages/ruby.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index d411d643ae..99d15019f1 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -15097,13 +15097,13 @@ (define-public ruby-cmath
(define-public ruby-sucker-punch
(package
(name "ruby-sucker-punch")
- (version "3.0.1")
+ (version "3.1.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "sucker_punch" version))
(sha256
- (base32 "0yams24wndpj7dzdysvm4z1w6ggg4xvj4snxba66prahhxvik4xl"))))
+ (base32 "12by9vx8q6l4i56q62k1s1ymaxbpg4rny5zngj5i5h09kyh2yp4p"))))
(build-system ruby-build-system)
(arguments
`(#:phases
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 14/24] gnu: ruby-shindo: Update to 0.3.10.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (12 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 13/24] gnu: ruby-sucker-punch: Update to 3.1.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 15/24] gnu: ruby-rjb: Update to 1.6.7 Christopher Baines
` (10 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-shindo): Update to 0.3.10.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 99d15019f1..f5eb6c5332 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3629,28 +3629,28 @@ (define-public ruby-hydra
(define-public ruby-shindo
(package
(name "ruby-shindo")
- (version "0.3.8")
+ (version "0.3.10")
(source (origin
(method url-fetch)
(uri (rubygems-uri "shindo" version))
(sha256
(base32
- "0s8v1jbz8i0jh92f2fgxb3p51l1azrpkc8nv4mhrqy4vndpvd7wq"))))
+ "0qnqixhi0g8v44v13f3gynpbvvw6xqi1wajsxdjsx5rhzizfsj91"))))
(build-system ruby-build-system)
(arguments
- `(#:test-target "shindo_tests"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
- (lambda _
- (substitute* "tests/tests_helper.rb"
- (("-rubygems") ""))
- (substitute* "Rakefile"
- (("system \"shindo") "system \"./bin/shindo")
- ;; This test doesn't work, so we disable it.
- (("fail \"The build_error test should fail") "#")
- ((" -rubygems") ""))
- #t)))))
+ (list
+ #:test-target "shindo_tests"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "tests/tests_helper.rb"
+ (("-rubygems") ""))
+ (substitute* "Rakefile"
+ (("system \"shindo") "system \"./bin/shindo")
+ ;; This test doesn't work, so we disable it.
+ (("fail \"The build_error test should fail") "#")
+ ((" -rubygems") "")))))))
(propagated-inputs
(list ruby-formatador))
(synopsis "Simple depth first Ruby testing")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 15/24] gnu: ruby-rjb: Update to 1.6.7.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (13 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 14/24] gnu: ruby-shindo: Update to 0.3.10 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 16/24] gnu: ruby-range-compressor: Update to 1.2.0 Christopher Baines
` (9 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-rjb): Update to 1.6.7.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index f5eb6c5332..490edba443 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1212,22 +1212,22 @@ (define-public ruby-bump
(define-public ruby-rjb
(package
(name "ruby-rjb")
- (version "1.5.5")
+ (version "1.6.7")
(source (origin
(method url-fetch)
(uri (rubygems-uri "rjb" version))
(sha256
(base32
- "1ppj8rbicj3w0nhh7f73mflq19yd7pzdzkh2a91hcvphriy5b0ca"))))
+ "0ck802bm8cklhmqsgzhsa0y8lg80qy52dp3m8rlld3zc5gv1rsb9"))))
(build-system ruby-build-system)
(arguments
- `(#:tests? #f ; no rakefile
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'set-java-home
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
- #t)))))
+ (list
+ #:tests? #f ; no rakefile
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'set-java-home
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "JAVA_HOME" (assoc-ref inputs "jdk")))))))
(native-inputs
`(("jdk" ,icedtea "jdk")))
(synopsis "Ruby-to-Java bridge using the Java Native Interface")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 16/24] gnu: ruby-range-compressor: Update to 1.2.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (14 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 15/24] gnu: ruby-rjb: Update to 1.6.7 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 17/24] gnu: ruby-pry-doc: Update to 1.4.0 Christopher Baines
` (8 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-range-compressor): Update to 1.2.0.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 490edba443..6a2b89cebd 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -8471,7 +8471,7 @@ (define-public ruby-character-set
(define-public ruby-range-compressor
(package
(name "ruby-range-compressor")
- (version "1.0.0")
+ (version "1.2.0")
(source
(origin
(method git-fetch)
@@ -8481,17 +8481,18 @@ (define-public ruby-range-compressor
(file-name (git-file-name name version))
(sha256
(base32
- "0y8slri2msyyg2szgwgriqd6qw9hkxycssdrcl5lk2dbcq5zvn54"))))
+ "1zmc44si5ac2h7r1x4f1j8z5yr6wz528c7dssh0g70fmczs3pfga"))))
(build-system ruby-build-system)
(arguments
- `(#:test-target "spec"
- #:phases (modify-phases %standard-phases
- (add-after 'extract-gemspec 'strip-version-requirements
- (lambda _
- (substitute* "range_compressor.gemspec"
- (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped)
- (string-append stripped "\n")))
- #t)))))
+ (list
+ #:test-target "spec"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'extract-gemspec 'strip-version-requirements
+ (lambda _
+ (substitute* "range_compressor.gemspec"
+ (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped)
+ (string-append stripped "\n"))))))))
(native-inputs
(list ruby-rspec))
(synopsis "Simple arrays of objects to arrays of ranges compressor")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 17/24] gnu: ruby-pry-doc: Update to 1.4.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (15 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 16/24] gnu: ruby-range-compressor: Update to 1.2.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 18/24] gnu: ruby-powerpack: Update to 0.1.3 Christopher Baines
` (7 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-pry-doc): Update to 1.4.0.
---
gnu/packages/ruby.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 6a2b89cebd..a221f2fcaa 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -6732,13 +6732,13 @@ (define-public ruby-pry
(define-public ruby-pry-doc
(package
(name "ruby-pry-doc")
- (version "1.3.0")
+ (version "1.4.0")
(source (origin
(method url-fetch)
(uri (rubygems-uri "pry-doc" version))
(sha256
(base32
- "0wyvql6pb6m8jl8bsamabxhxhd86bnqblspaxzz05sl0fm2ynj0r"))))
+ "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx"))))
(build-system ruby-build-system)
(propagated-inputs (list ruby-pry ruby-yard))
(native-inputs (list ruby-latest-ruby ruby-rspec ruby-rake)) ;for tests
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 18/24] gnu: ruby-powerpack: Update to 0.1.3.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (16 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 17/24] gnu: ruby-pry-doc: Update to 1.4.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 19/24] gnu: ruby-mkmf-lite: Update to 0.5.2 Christopher Baines
` (6 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-powerpack): Update to 0.1.3.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index a221f2fcaa..9811937674 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4377,17 +4377,17 @@ (define-public ruby-power-assert
(define-public ruby-powerpack
(package
(name "ruby-powerpack")
- (version "0.1.2")
+ (version "0.1.3")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "powerpack" version))
(sha256
(base32
- "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"))))
+ "1f71axvlhnxja0k17qqxdi4qh5ck807hqg4i3j6cgy8fgzmyg7rg"))))
(build-system ruby-build-system)
(arguments
- '(#:test-target "spec"))
+ (list #:test-target "spec"))
(native-inputs
(list bundler ruby-rspec ruby-yard))
(synopsis "Useful extensions to core Ruby classes")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 19/24] gnu: ruby-mkmf-lite: Update to 0.5.2.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (17 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 18/24] gnu: ruby-powerpack: Update to 0.1.3 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 20/24] gnu: ruby-memory-profiler: Update to 1.0.1 Christopher Baines
` (5 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-mkmf-lite): Update to 0.5.2.
[arguments]: Avoid the rubocop dependency.
[native-inputs]: Add ruby-rspec.
---
gnu/packages/ruby.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 9811937674..d8e85a79aa 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4704,16 +4704,27 @@ (define-public ruby-metaclass
(define-public ruby-mkmf-lite
(package
(name "ruby-mkmf-lite")
- (version "0.3.2")
+ (version "0.5.2")
(source (origin
(method url-fetch)
(uri (rubygems-uri "mkmf-lite" version))
(sha256
(base32
- "0br9k6zijj1zc25n8p7f2j1mwl58nfgdknf3q13h9k156jvrir06"))))
+ "0rqa5kzswhqkj7r9mqrqz4mjd2vdxsblgybb52gj3mwr1gwvl4c5"))))
(build-system ruby-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Avoid rubocop dependency
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "rspec")))))))
(propagated-inputs
(list ruby-ptools))
+ (native-inputs
+ (list ruby-rspec))
(synopsis "Lightweight alternative to @code{mkmf}")
(description
"@code{mkmf-lite} is a light version of Ruby's @code{mkmf.rb} designed
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 20/24] gnu: ruby-memory-profiler: Update to 1.0.1.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (18 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 19/24] gnu: ruby-mkmf-lite: Update to 0.5.2 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 21/24] gnu: ruby-hocon: Update to 1.4.0 Christopher Baines
` (4 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-memory-profiler): Update to 1.0.1.
---
gnu/packages/ruby.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index d8e85a79aa..6dc053bf64 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -9215,7 +9215,7 @@ (define-public ruby-ruby-memcheck
(define-public ruby-memory-profiler
(package
(name "ruby-memory-profiler")
- (version "1.0.0")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
@@ -9225,7 +9225,7 @@ (define-public ruby-memory-profiler
(file-name (git-file-name name version))
(sha256
(base32
- "07yqv11q68xg2fqkrhs6ysngryk8b9zq6qzh24rgx9xqv6qfnj0w"))))
+ "1z1x0rymfv45gh1y3s46w5pga5y8cvgn228jiwlnhc8hin3zig84"))))
(build-system ruby-build-system)
(synopsis "Memory profiling routines for Ruby")
(description
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 21/24] gnu: ruby-hocon: Update to 1.4.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (19 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 20/24] gnu: ruby-memory-profiler: Update to 1.0.1 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 22/24] gnu: ruby-debug-inspector: Update to 1.1.0 Christopher Baines
` (3 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-hocon): Update to 1.4.0.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 6dc053bf64..6695bb025b 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -5977,7 +5977,7 @@ (define-public ruby-git
(define-public ruby-hocon
(package
(name "ruby-hocon")
- (version "1.3.1")
+ (version "1.4.0")
(home-page "https://github.com/puppetlabs/ruby-hocon")
(source (origin
(method git-fetch)
@@ -5985,16 +5985,17 @@ (define-public ruby-hocon
(file-name (git-file-name name version))
(sha256
(base32
- "172hh2zr0n9nnszv0qvlgwszgkrq84yahrg053m68asy79zpmbqr"))))
+ "04wgv0pwrghawnl6qp346z59fvp9v37jymq8p0lsrzxa6nvrykmk"))))
(build-system ruby-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (if tests?
- (invoke "rspec")
- (format #t "test suite not run~%"))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "rspec")
+ (format #t "test suite not run~%")))))))
(native-inputs
(list bundler ruby-rspec))
(synopsis "HOCON config library")
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 22/24] gnu: ruby-debug-inspector: Update to 1.1.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (20 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 21/24] gnu: ruby-hocon: Update to 1.4.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 23/24] gnu: ruby-commander: Update to 4.6.0 Christopher Baines
` (2 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150
* gnu/packages/rails.scm (ruby-debug-inspector): Update to 1.1.0.
[arguments]: Update style.
[native-inputs]: Add ruby-rake-compiler.
---
gnu/packages/rails.scm | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index b1abb65a6d..9709121a19 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -207,25 +207,28 @@ (define-public ruby-sass-rails
(define-public ruby-debug-inspector
(package
(name "ruby-debug-inspector")
- (version "0.0.3")
+ (version "1.1.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "debug_inspector" version))
(sha256
(base32
- "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"))))
+ "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"))))
(build-system ruby-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "rake" "compile")
- (invoke "ruby" "-Ilib" "-e"
- (string-append
- "require 'debug_inspector'; RubyVM::DebugInspector."
- "open{|dc| p dc.backtrace_locations}")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "rake" "compile")
+ (invoke "ruby" "-Ilib" "-e"
+ (string-append
+ "require 'debug_inspector'; RubyVM::DebugInspector."
+ "open{|dc| p dc.backtrace_locations}")))))))
+ (native-inputs
+ (list ruby-rake-compiler))
(synopsis "Ruby wrapper for the MRI 2.0 debug_inspector API")
(description
"This package provides a Ruby wrapper for the MRI 2.0 debug_inspector
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 23/24] gnu: ruby-commander: Update to 4.6.0.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (21 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 22/24] gnu: ruby-debug-inspector: Update to 1.1.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 24/24] gnu: bioruby: Update to 2.0.4 Christopher Baines
2023-06-20 21:20 ` bug#64150: [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150; +Cc: Christopher Baines
* gnu/packages/ruby.scm (ruby-commander): Update to 4.6.0.
[arguments]: Update style.
---
gnu/packages/ruby.scm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 6695bb025b..1feb43d649 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -321,27 +321,27 @@ (define-public mruby
(define-public ruby-commander
(package
(name "ruby-commander")
- (version "4.4.7")
+ (version "4.6.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "commander" version))
(sha256
(base32
- "1pxakz596fjqak3cdbha6iva1dlqis86i3kjrgg6lf3sp8i5vhwg"))))
+ "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx"))))
(build-system ruby-build-system)
(arguments
- `(#:test-target "spec"
- #:phases
- (modify-phases %standard-phases
- ;; Don't run or require rubocop, the code linting tool, as this is a
- ;; bit unnecessary.
- (add-after 'unpack 'dont-run-rubocop
- (lambda _
- (substitute* "Rakefile"
- ((".*rubocop.*") "")
- ((".*RuboCop.*") ""))
- #t)))))
+ (list
+ #:test-target "spec"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Don't run or require rubocop, the code linting tool, as this is a
+ ;; bit unnecessary.
+ (add-after 'unpack 'dont-run-rubocop
+ (lambda _
+ (substitute* "Rakefile"
+ ((".*rubocop.*") "")
+ ((".*RuboCop.*") "")))))))
(propagated-inputs
(list ruby-highline))
(native-inputs
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 24/24] gnu: bioruby: Update to 2.0.4.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (22 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 23/24] gnu: ruby-commander: Update to 4.6.0 Christopher Baines
@ 2023-06-18 11:28 ` Christopher Baines
2023-06-20 21:20 ` bug#64150: [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:28 UTC (permalink / raw)
To: 64150
* gnu/packages/bioinformatics.scm (bioruby): Update to 2.0.4.
[arguments]: Update style.
---
gnu/packages/bioinformatics.scm | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 9e356cba5d..4edcc28d12 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10876,34 +10876,34 @@ (define-public bio-blastxmlparser
(define-public bioruby
(package
(name "bioruby")
- (version "1.5.2")
+ (version "2.0.4")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "bio" version))
(sha256
(base32
- "1d56amdsjv1mag7m6gv2w0xij8hqx1v5xbdjsix8sp3yp36m7938"))))
+ "08aknxk2ingwscwfqpw5vnax6jpk1sxfaialravladb63hcl8dx9"))))
(build-system ruby-build-system)
(propagated-inputs
(list ruby-libxml))
(native-inputs
(list which)) ; required for test phase
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'build 'patch-test-command
- (lambda _
- (substitute* '("test/functional/bio/test_command.rb")
- (("/bin/sh") (which "sh")))
- (substitute* '("test/functional/bio/test_command.rb")
- (("/bin/ls") (which "ls")))
- (substitute* '("test/functional/bio/test_command.rb")
- (("which") (which "which")))
- (substitute* '("test/functional/bio/test_command.rb",
- "test/data/command/echoarg2.sh")
- (("/bin/echo") (which "echo")))
- #t)))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'patch-test-command
+ (lambda _
+ (substitute* '("test/functional/bio/test_command.rb")
+ (("/bin/sh") (which "sh")))
+ (substitute* '("test/functional/bio/test_command.rb")
+ (("/bin/ls") (which "ls")))
+ (substitute* '("test/functional/bio/test_command.rb")
+ (("which") (which "which")))
+ (substitute* '("test/functional/bio/test_command.rb"
+ "test/data/command/echoarg2.sh")
+ (("/bin/echo") (which "echo"))))))))
(synopsis "Ruby library, shell and utilities for bioinformatics")
(description "BioRuby comes with a comprehensive set of Ruby development
tools and libraries for bioinformatics and molecular biology. BioRuby has
--
2.40.1
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2.
2023-06-18 11:28 ` [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2 Christopher Baines
@ 2023-06-18 11:35 ` Liliana Marie Prikler
2023-06-18 11:49 ` Christopher Baines
0 siblings, 1 reply; 28+ messages in thread
From: Liliana Marie Prikler @ 2023-06-18 11:35 UTC (permalink / raw)
To: Christopher Baines, 64150; +Cc: Raghav Gururajan, Maxim Cournoyer
Am Sonntag, dem 18.06.2023 um 12:28 +0100 schrieb Christopher Baines:
> So that ruby can change without affecting this package and its
> dependants.
>
> * gnu/packages/webkit.scm (webkitgtk)[native-inputs]: Explicitly use
> ruby-2.7.
>
> Signed-off-by: Christopher Baines <mail@cbaines.net>
On the off chance that one of the GNOME team has to comment, LGTM.
You should probably commit this without the Signed-off-by part, though,
given that this seems to be your own commit.
Cheers
^ permalink raw reply [flat|nested] 28+ messages in thread
* [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2.
2023-06-18 11:35 ` Liliana Marie Prikler
@ 2023-06-18 11:49 ` Christopher Baines
0 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-18 11:49 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: Raghav Gururajan, 64150, Maxim Cournoyer
[-- Attachment #1: Type: text/plain, Size: 835 bytes --]
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Sonntag, dem 18.06.2023 um 12:28 +0100 schrieb Christopher Baines:
>> So that ruby can change without affecting this package and its
>> dependants.
>>
>> * gnu/packages/webkit.scm (webkitgtk)[native-inputs]: Explicitly use
>> ruby-2.7.
>>
>> Signed-off-by: Christopher Baines <mail@cbaines.net>
>
> On the off chance that one of the GNOME team has to comment, LGTM.
I didn't realise you (and others were included in the X-Debbugs-Cc)
headers here, so apologies for that.
Anyway, team approval was discussed in #61894, but it hasn't happened
yet. I still appreciate you taking a look and your input though.
> You should probably commit this without the Signed-off-by part, though,
> given that this seems to be your own commit.
Indeed, I've removed that locally now.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* bug#64150: [PATCH 00/24] Various changes to support updating the default ruby.
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
` (23 preceding siblings ...)
2023-06-18 11:28 ` [bug#64150] [PATCH 24/24] gnu: bioruby: Update to 2.0.4 Christopher Baines
@ 2023-06-20 21:20 ` Christopher Baines
24 siblings, 0 replies; 28+ messages in thread
From: Christopher Baines @ 2023-06-20 21:20 UTC (permalink / raw)
To: 64150-done
[-- Attachment #1: Type: text/plain, Size: 2004 bytes --]
Christopher Baines <mail@cbaines.net> writes:
> I'm looking at updating the default ruby, and these changes update some
> packages that might break, plus explicitly using ruby-2.7 in places to
> reduce the dependencies on ruby.
>
> Christopher Baines (24):
> gnu: texlive-hyphen-package: Explicitly use ruby-2.7.
> gnu: texlive-hyph-utf8: Explicitly use ruby-2.7.
> gnu: texlive-bin: Explicitly use ruby-2.7.
> gnu: qtbase: Explicitly use ruby-2.7.
> gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal.
> gnu: qtwebengine-5: Explicitly use ruby-2.7.
> gnu: utf8proc-2.7.0: Explicitly use ruby-2.7.
> gnu: webkitgtk: Explicitly use ruby-2.
> gnu: mkvtoolnix: Explicitly use ruby-2.7.
> gnu: ruby-yajl-ruby: Update to 1.4.3.
> gnu: ruby-tzinfo: Update to 2.0.6.
> gnu: ruby-test-unit: Update to 3.6.0.
> gnu: ruby-sucker-punch: Update to 3.1.0.
> gnu: ruby-shindo: Update to 0.3.10.
> gnu: ruby-rjb: Update to 1.6.7.
> gnu: ruby-range-compressor: Update to 1.2.0.
> gnu: ruby-pry-doc: Update to 1.4.0.
> gnu: ruby-powerpack: Update to 0.1.3.
> gnu: ruby-mkmf-lite: Update to 0.5.2.
> gnu: ruby-memory-profiler: Update to 1.0.1.
> gnu: ruby-hocon: Update to 1.4.0.
> gnu: ruby-debug-inspector: Update to 1.1.0.
> gnu: ruby-commander: Update to 4.6.0.
> gnu: bioruby: Update to 2.0.4.
>
> gnu/packages/bioinformatics.scm | 32 ++---
> gnu/packages/qt.scm | 4 +-
> gnu/packages/rails.scm | 25 ++--
> gnu/packages/ruby.scm | 231 ++++++++++++++++++--------------
> gnu/packages/tex.scm | 6 +-
> gnu/packages/textutils.scm | 2 +-
> gnu/packages/video.scm | 2 +-
> gnu/packages/webkit.scm | 2 +-
> 8 files changed, 165 insertions(+), 139 deletions(-)
QA hasn't quite finished testing this, but I think I checked everything
builds locally on x86_64-linux (at least after also updating
ruby-ptools).
I've now pushed to master as 53d80d04854f263e360d5f2b9e1d00ff5dad5227.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-06-20 21:22 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-18 11:23 [bug#64150] [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 01/24] gnu: texlive-hyphen-package: Explicitly use ruby-2.7 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 02/24] gnu: texlive-hyph-utf8: " Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 03/24] gnu: texlive-bin: " Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 04/24] gnu: qtbase: " Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 05/24] gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 06/24] gnu: qtwebengine-5: Explicitly use ruby-2.7 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 07/24] gnu: utf8proc-2.7.0: " Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 08/24] gnu: webkitgtk: Explicitly use ruby-2 Christopher Baines
2023-06-18 11:35 ` Liliana Marie Prikler
2023-06-18 11:49 ` Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 09/24] gnu: mkvtoolnix: Explicitly use ruby-2.7 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 10/24] gnu: ruby-yajl-ruby: Update to 1.4.3 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 11/24] gnu: ruby-tzinfo: Update to 2.0.6 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 12/24] gnu: ruby-test-unit: Update to 3.6.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 13/24] gnu: ruby-sucker-punch: Update to 3.1.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 14/24] gnu: ruby-shindo: Update to 0.3.10 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 15/24] gnu: ruby-rjb: Update to 1.6.7 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 16/24] gnu: ruby-range-compressor: Update to 1.2.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 17/24] gnu: ruby-pry-doc: Update to 1.4.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 18/24] gnu: ruby-powerpack: Update to 0.1.3 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 19/24] gnu: ruby-mkmf-lite: Update to 0.5.2 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 20/24] gnu: ruby-memory-profiler: Update to 1.0.1 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 21/24] gnu: ruby-hocon: Update to 1.4.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 22/24] gnu: ruby-debug-inspector: Update to 1.1.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 23/24] gnu: ruby-commander: Update to 4.6.0 Christopher Baines
2023-06-18 11:28 ` [bug#64150] [PATCH 24/24] gnu: bioruby: Update to 2.0.4 Christopher Baines
2023-06-20 21:20 ` bug#64150: [PATCH 00/24] Various changes to support updating the default ruby Christopher Baines
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.