aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/ruby.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-07 21:33:32 +0100
committerMarius Bakke <marius@gnu.org>2020-11-07 21:33:32 +0100
commit32787d652460871a79f99b63230f92759e2e0de2 (patch)
treece883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/ruby.scm
parent052939c2f6e36de00a5e756ea29a4cc96884a55d (diff)
parentc2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff)
downloadguix-32787d652460871a79f99b63230f92759e2e0de2.tar
guix-32787d652460871a79f99b63230f92759e2e0de2.tar.gz
Merge branch 'master' into staging
Conflicts: gnu/local.mk gnu/packages/gdb.scm gnu/packages/lisp-xyz.scm gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/ruby.scm')
-rw-r--r--gnu/packages/ruby.scm37
1 files changed, 33 insertions, 4 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index cd452f88d3..2bef683b4a 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -147,16 +147,16 @@ a focus on simplicity and productivity.")
(define-public ruby-2.7
(package
(inherit ruby)
- (version "2.7.1")
+ (version "2.7.2")
(source
(origin
(method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+ (uri (string-append "https://cache.ruby-lang.org/pub/ruby/"
(version-major+minor version)
"/ruby-" version ".tar.gz"))
(sha256
(base32
- "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l"))
+ "1m63461mxi3fg4y3bspbgmb0ckbbb1ldgf9xi0piwkpfsk80cmvf"))
(modules '((guix build utils)))
(snippet `(begin
;; Remove bundled libffi
@@ -2416,7 +2416,9 @@ extensions.")
(arguments
'(#:tests? #f ; test suite hangs for unknown reason
#:gem-flags
- (list "--"
+ (list "--no-document" ; TODO: Re-enable when documentation
+ ; generation works
+ "--"
(string-append "--with-xml2-include="
(assoc-ref %build-inputs "libxml2")
"/include/libxml2" ))))
@@ -3847,6 +3849,10 @@ as a base class when writing classes that depend upon
(base32
"1r19ifc4skyl2gxnifrxa5jvbbay9fb2in79ppgv02b6n4bhsw90"))))
(build-system ruby-build-system)
+ (arguments
+ ;; The test suite fails (see:
+ ;; https://github.com/cldwalker/bond/issues/46).
+ `(#:tests? #f))
(native-inputs
`(("ruby-bacon" ,ruby-bacon)
("ruby-bacon-bits" ,ruby-bacon-bits)
@@ -4518,6 +4524,29 @@ reporter.")
(home-page "https://blowmage.com/minitest-rg/")
(license license:expat)))
+(define-public ruby-minitest-global-expectations
+ (package
+ (name "ruby-minitest-global-expectations")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (rubygems-uri "minitest-global_expectations"
+ version))
+ (sha256
+ (base32
+ "1pp3k2608spj4kvqy2y16hs18an917g6vwgvphrfhjviac83090x"))))
+ (build-system ruby-build-system)
+ (propagated-inputs
+ `(("ruby-minitest" ,ruby-minitest)))
+ (synopsis "Adjust minitest behaviour for calling expectation methods")
+ (description
+ "Minitest-global_expectations allows continued use of expectation methods
+on all objects. Calling expectation methods on all objects was deprecated in
+minitest 5.12, and is planned to be removed from minitest 6.")
+ (home-page "https://github.com/jeremyevans/minitest-global_expectations")
+ (license license:expat)))
+
(define-public ruby-minitest-hooks
(package
(name "ruby-minitest-hooks")