From fd248cb815d571043c3a0c52a01c9b3e368a069e Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Mon, 9 Dec 2019 14:46:47 -0600 Subject: gnu: ruby: Configure for dynamic linking. * gnu/packages/ruby.scm (ruby)[arguments]: Use #:configure-flags to properly enable dynamic linking instead of using libruby-static.a. Fixes #38500: Reported-by: Vicente Eduardo --- gnu/packages/ruby.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e1d69f96553..d30ee415c45 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Collin J. Doering ;;; Copyright © 2019 Diego N. Barbato +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ (build-system gnu-build-system) (arguments `(#:test-target "test" + #:configure-flags '("--enable-shared") ; dynamic linking #:phases (modify-phases %standard-phases (add-before 'configure 'replace-bin-sh-and-remove-libffi -- cgit v1.3 From 3cc8e029a08f33f6fd8d033e46f56efe499de563 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Jan 2020 23:36:36 +0100 Subject: gnu: Add ruby-hydra. * gnu/packages/ruby.scm (ruby-hydra): New public variable. --- gnu/packages/ruby.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 57d7fa91f3c..969fc95a00f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur @@ -1953,6 +1953,40 @@ two hashes.") (home-page "https://github.com/liufengyun/hashdiff") (license license:expat))) +(define-public ruby-hydra + ;; No releases yet. + (let ((commit "5abfa378743756ae4d9306cc134bcc482f5c9525") + (revision "0")) + (package + (name "ruby-hydra") + (version (git-version "0.0" revision commit)) + (home-page "https://github.com/hyphenation/hydra") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cik398l2765y3d9sdhjzki3303hkry58ac6jlkiy7iy62nm529f")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (replace 'check + (lambda _ + (invoke "rspec")))))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (propagated-inputs + `(("ruby-byebug" ,ruby-byebug))) + (synopsis "Ruby hyphenation patterns") + (description + "ruby-hydra is a Ruby library for working with hyphenation patterns.") + (license license:expat)))) + (define-public ruby-shindo (package (name "ruby-shindo") -- cgit v1.3 From 12341d344a91b073b210a72bde30f6781fe6d9cd Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:57:54 +0000 Subject: gnu: ruby-listen: Update to 3.2.0. This avoids some test failures when updating Ruby to 2.6. * gnu/packages/ruby.scm (ruby-listen): Update to 3.2.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 969fc95a00f..cc3510b98da 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4584,7 +4584,7 @@ a native C extension.") (define-public ruby-listen (package (name "ruby-listen") - (version "3.1.5") + (version "3.2.0") (source (origin ;; The gem does not include a Rakefile, so fetch from the Git @@ -4596,7 +4596,7 @@ a native C extension.") (file-name (git-file-name name version)) (sha256 (base32 - "1hqmkfa9f2xb5jlvqbafdxjd5ax75jm8gqj5nh3k22xq0kacsvgg")))) + "1hkp1g6hk5clsmbd001gkc12ma6s459x820piajyasv61m87if24")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" -- cgit v1.3 From cf7201c4cc8be4b66f16da1670edee8fe6e1fd72 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:02 +0000 Subject: gnu: ruby-aruba: Update to 0.14.14. Stop patching out the use of simplecov, it's used throughout the tests now, so it's not as simple to avoid using it. * gnu/packages/ruby.scm (ruby-aruba): Update to 0.14.14. [arguments]: Stop patching out the use of simplecov. [native-inputs]: Add ruby-simplecov. --- gnu/packages/ruby.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cc3510b98da..b11dc8a1389 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5441,14 +5441,14 @@ It is intended be used by all Cucumber implementations to parse (define-public ruby-aruba (package (name "ruby-aruba") - (version "0.14.8") + (version "0.14.14") (source (origin (method url-fetch) (uri (rubygems-uri "aruba" version)) (sha256 (base32 - "0zdd81l1lp0x78sxa6kkfqclpj5il3xl70nz05wqv2sfzzhqydxh")))) + "0l2mfpdxc03gdrbwc2hv4vdhjhqhfcdp6d02j05j64ncpi9srlqn")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" @@ -5480,11 +5480,7 @@ It is intended be used by all Cucumber implementations to parse ((".*cucumber.*") "\n") ((".*license_finder.*") "\n") ((".*rake.*") "gem 'rake'\n") - ((".*simplecov.*") "\n") ((".*relish.*") "\n")) - (substitute* "spec/spec_helper.rb" - ((".*simplecov.*") "") - (("^SimpleCov.*") "")) (substitute* "aruba.gemspec" (("spec\\.add\\_runtime\\_dependency 'cucumber'.*") "spec.add_runtime_dependency 'cucumber'")) @@ -5494,7 +5490,8 @@ It is intended be used by all Cucumber implementations to parse (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec) - ("ruby-fuubar" ,ruby-fuubar))) + ("ruby-fuubar" ,ruby-fuubar) + ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs `(("ruby-childprocess" ,ruby-childprocess) ("ruby-contracts" ,ruby-contracts) -- cgit v1.3 From 5142012471867818f18574dc1202a52ce8eedfb7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:13 +0000 Subject: gnu: ruby-childprocess-0.6: Remove version 0.6.3. As it is unused. * gnu/packages/ruby.scm (ruby-childprocess-0.6): Rename to ruby-childprocess. [version, source]: Copy from ruby-childprocess. --- gnu/packages/ruby.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b11dc8a1389..ae40be29a22 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7460,17 +7460,17 @@ in standard Ruby syntax.") (home-page "https://github.com/ruby/rake") (license license:expat))) -(define-public ruby-childprocess-0.6 +(define-public ruby-childprocess (package (name "ruby-childprocess") - (version "0.6.3") + (version "0.9.0") (source (origin (method url-fetch) (uri (rubygems-uri "childprocess" version)) (sha256 (base32 - "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv")))) + "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) @@ -7485,19 +7485,6 @@ programs running in the background, in Ruby.") (home-page "http://github.com/enkessler/childprocess") (license license:expat))) -(define-public ruby-childprocess - (package - (inherit ruby-childprocess-0.6) - (name "ruby-childprocess") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "childprocess" version)) - (sha256 - (base32 - "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))))) - (define-public ruby-public-suffix (package (name "ruby-public-suffix") -- cgit v1.3 From 459e4a1aa184ad863eec4374ca7683de92b4aa06 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:17 +0000 Subject: gnu: ruby-childprocess: Update to 3.0.0. * gnu/packages/ruby.scm (ruby-childprocess): Update to 3.0.0. [home-page]: Switch to https, as it's supported by github.com. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ae40be29a22..140d9f5fd2d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7463,14 +7463,14 @@ in standard Ruby syntax.") (define-public ruby-childprocess (package (name "ruby-childprocess") - (version "0.9.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "childprocess" version)) (sha256 (base32 - "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))) + "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5")))) (build-system ruby-build-system) (arguments `(#:tests? #f)) @@ -7482,7 +7482,7 @@ in standard Ruby syntax.") (synopsis "Control external programs running in the background, in Ruby") (description "@code{childprocess} provides a gem to control external programs running in the background, in Ruby.") - (home-page "http://github.com/enkessler/childprocess") + (home-page "https://github.com/enkessler/childprocess") (license license:expat))) (define-public ruby-public-suffix -- cgit v1.3 From f321380fb3fa5921dcbe77df4329af8b242a2dcb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:22 +0000 Subject: gnu: ruby-yard: Update to 0.9.20. * gnu/packages/ruby.scm (ruby-yard): Update to 0.9.20. [arguments]: Delete the Gemfile before running the tests. [native-inputs]: Add ruby-redcloth and ruby-asciidoctor. --- gnu/packages/ruby.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 140d9f5fd2d..eec20b088fc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5783,7 +5783,7 @@ A modified copy of yajl is used, and included in the package.") (define-public ruby-yard (package (name "ruby-yard") - (version "0.9.16") + (version "0.9.20") (source (origin (method git-fetch) @@ -5794,20 +5794,24 @@ A modified copy of yajl is used, and included in the package.") (file-name (git-file-name name version)) (sha256 (base32 - "0a4r1pfs0ms4vlccsf1x2jckx35lqm8b8lh6rdjxqfr5fia5izpf")))) + "1v48zz8hzazrg79jksj9siys21d2axvzijvkxw2j42zh86syi1wi")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ + ;; Delete the Gemfile to avoid errors relating to it + (delete-file "Gemfile") ;; $HOME needs to be set to somewhere writeable for tests to run (setenv "HOME" "/tmp") ;; Run tests without using 'rake' to avoid dependencies. (invoke "rspec")))))) (native-inputs `(("ruby-rspec" ,ruby-rspec) - ("ruby-rack" ,ruby-rack))) + ("ruby-rack" ,ruby-rack) + ("ruby-redcloth" ,ruby-redcloth) + ("ruby-asciidoc" ,ruby-asciidoctor))) (synopsis "Documentation generation tool for Ruby") (description "YARD is a documentation generation tool for the Ruby programming -- cgit v1.3 From d0d2dd24de81a90116008863b2a868de43d3663f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:28 +0000 Subject: gnu: ruby-hoe: Update to 3.21.0. * gnu/packages/ruby.scm (ruby-hoe): Update to 3.21.0. [arguments]: Avoid having SOURCE_DATE_EPOCH set while the tests are running. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index eec20b088fc..48cbf427d5d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -299,14 +299,32 @@ a menu system for providing multiple options to the user.") (define-public ruby-hoe (package (name "ruby-hoe") - (version "3.16.2") + (version "3.21.0") (source (origin (method url-fetch) (uri (rubygems-uri "hoe" version)) (sha256 (base32 - "12q6dn2irsfamdbjpqvs0dwl4i1vl7wflxrcg972h9jw0ds38f3a")))) + "0qid0n56mgsjvq5ksxajv0gb92akky8imwgvw22ajms5g4fd6nf4")))) (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; One of the tests fails if the SOURCE_DATE_EPOCH environment + ;; variable is set, so unset it for the duration of the tests. + ;; + ;; TestHoe#test_possibly_better + ;; [/tmp/guix-build-ruby-hoe-3.20.0.drv-0/gem/test/test_hoe.rb:250]: + ;; Expected: 2019-11-12 00:00:00 UTC + ;; Actual: 1970-01-01 00:00:00 UTC + (add-before 'check 'unset-SOURCE-DATE-EPOCH + (lambda _ + (unsetenv "SOURCE_DATE_EPOCH") + #t)) + (add-after 'check 'set-SOURCE-DATE-EPOCH-again + (lambda _ + (setenv "SOURCE_DATE_EPOCH" "1") + #t))))) (synopsis "Ruby project management helper") (description "Hoe is a rake/rubygems helper for project Rakefiles. It helps manage, -- cgit v1.3 From 6754323bd865d3b58c5049c55fb9744ff1a41893 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:37 +0000 Subject: gnu: ruby-power-assert: Update to 1.1.5. * gnu/packages/ruby.scm (ruby-power-assert): Update to 1.1.5. [arguments]: Disable running the tests. --- gnu/packages/ruby.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 48cbf427d5d..5db3d3b2ef6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2292,14 +2292,16 @@ using Net::HTTP, supporting reconnection and retry according to RFC 2616.") (define-public ruby-power-assert (package (name "ruby-power-assert") - (version "0.2.7") + (version "1.1.5") (source (origin (method url-fetch) (uri (rubygems-uri "power_assert" version)) (sha256 (base32 - "0ka6w71lcan4wgf111xi3pcn9ma9lhakv31jg8w007nwzi0xfjbi")))) + "1dii0wkfa0jm8sk9b20zl1z4980dmrjh0zqnii058485pp3ws10s")))) (build-system ruby-build-system) + (arguments + '(#:tests? #f)) ; No included tests (native-inputs `(("bundler" ,bundler))) (synopsis "Assert library with descriptive assertion messages") -- cgit v1.3 From 1c65d99f1b455ac06c6e30594aa4d8243d36b8b6 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:41 +0000 Subject: gnu: ruby-json-pure: Update to 2.2.0. * gnu/packages/ruby.scm (ruby-json-pure): Update to 2.2.0. [home-page]: Add trailing /, due to a redirect. --- gnu/packages/ruby.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5db3d3b2ef6..34c7b9c157f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4498,13 +4498,13 @@ a native C extension.") (define-public ruby-json-pure (package (name "ruby-json-pure") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (rubygems-uri "json_pure" version)) (sha256 (base32 - "12yf9fmhr4c2jm3xl20vf1qyz5i63vc8a6ngz9j0f86nqwhmi2as")))) + "0m0j1mfwv0mvw72kzqisb26xjl236ivqypw1741dkis7s63b8439")))) (build-system ruby-build-system) (arguments `(#:phases @@ -4538,7 +4538,7 @@ a native C extension.") (synopsis "JSON implementation in pure Ruby") (description "This package provides a JSON implementation written in pure Ruby.") - (home-page "https://flori.github.com/json") + (home-page "https://flori.github.com/json/") (license license:ruby))) (define-public ruby-jwt -- cgit v1.3 From 740fea08727fc300f530e00fab49a57e984387cb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:58:56 +0000 Subject: gnu: ruby-tzinfo: Skip safe tests. The safe tests attempt to run with Ruby 2.6, but these tests fail if the build takes place within /tmp, as the Ruby LOAD_PATH then includes /tmp, which is world writable. * gnu/packages/ruby.scm (ruby-tzinfo)[arguments]: Add skip-safe-tests phase. --- gnu/packages/ruby.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 34c7b9c157f..95d29850b54 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4108,6 +4108,16 @@ utilities for Ruby.") (base32 "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp")))) (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 = \\{\\}\\)") + "def safe_test(options = {}) + skip('The Guix build environment has an unsafe load path')")) + #t))))) (propagated-inputs `(("ruby-thread-safe" ,ruby-thread-safe))) (synopsis "Time zone library for Ruby") -- cgit v1.3 From f6d7df3ceea04187023cabfab402d7891cd9b81f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:59:01 +0000 Subject: gnu: ruby-2.4: Update to 2.4.9. * gnu/packages/ruby.scm (ruby-2.4): Update to 2.4.9. --- gnu/packages/ruby.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 95d29850b54..79a36e9c198 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -133,7 +133,7 @@ a focus on simplicity and productivity.") (define-public ruby-2.4 (package (inherit ruby) - (version "2.4.3") + (version "2.4.9") (source (origin (method url-fetch) @@ -142,8 +142,7 @@ a focus on simplicity and productivity.") "/ruby-" version ".tar.xz")) (sha256 (base32 - "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3")) - (patches (search-patches "ruby-rubygems-276-for-ruby24.patch")) + "0546ymj2h3iai679fvx17bb2hksrqyhh22llxgz8fwggac100khc")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi -- cgit v1.3 From 4914c157fd3380dd25a1b00f5b44638943f6353b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:59:05 +0000 Subject: gnu: ruby: Update to 2.6.5. Make zlib a propagated-input, as the pkgconfig configuration includes linking against zlib as default, which means that gems with native components will fail to build without zlib. * gnu/packages/ruby.scm (ruby): Update to 2.6.5. --- gnu/packages/ruby.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 79a36e9c198..ff1b63785cb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -78,7 +78,7 @@ (define-public ruby (package (name "ruby") - (version "2.5.3") + (version "2.6.5") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0vrhrw7kcz9mg0jkqnihkcxqy5k05v8k1j0y2735z8wfk8sx1j8w")) + "0qhsw2mr04f3lqinkh557msr35pb5rdaqy4vdxcj91flgxqxmmnm")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi @@ -118,8 +118,9 @@ `(("readline" ,readline) ("openssl" ,openssl) ("libffi" ,libffi) - ("gdbm" ,gdbm) - ("zlib" ,zlib))) + ("gdbm" ,gdbm))) + (propagated-inputs + `(("zlib" ,zlib))) (native-search-paths (list (search-path-specification (variable "GEM_PATH") -- cgit v1.3 From 227fab3ed8842b22337196ee21c79143fc093855 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 13 Jan 2020 19:59:11 +0000 Subject: gnu: Add ruby-2.5. * gnu/packages/ruby.scm (ruby-2.5): New variable. --- gnu/packages/ruby.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ff1b63785cb..50758d204b0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -131,6 +131,25 @@ a focus on simplicity and productivity.") (home-page "https://www.ruby-lang.org") (license license:ruby))) +(define-public ruby-2.5 + (package + (inherit ruby) + (version "2.5.7") + (source + (origin + (method url-fetch) + (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" + (version-major+minor version) + "/ruby-" version ".tar.xz")) + (sha256 + (base32 + "159zka4sbx1p4ayxqi7a5ybbzxvn3n5mivrz4d1damw9ypl70610")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively "ext/fiddle/libffi-3.2.1") + #t)))))) + (define-public ruby-2.4 (package (inherit ruby) -- cgit v1.3 From bcdd279a5fe561c0908f46d3ef4af5629bf60d47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 8 Apr 2020 13:21:24 +0200 Subject: gnu: ruby-sqlite3: Remove obsolete workaround. * gnu/packages/ruby.scm (ruby-sqlite3)[arguments]: Remove phase 'adjust-failing-test'. --- gnu/packages/ruby.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 87d98525fa8..7e6df38ad1d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6180,13 +6180,6 @@ neither too verbose nor too minimal.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'adjust-failing-test - (lambda _ - ;; XXX: This test fails with SQLite versions >= 3.21. - ;; See . - (substitute* "test/test_integration_resultset.rb" - (("\"integer\", \"text\"") "\"INTEGER\", \"text\"")) - #t)) (add-before 'check 'add-gemtest-file ;; This file exists in the repository but is not distributed. (lambda _ (invoke "touch" ".gemtest")))))) -- cgit v1.3