From 98bb983ca7ea2b393021bfee155a72b1c6183f72 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Tue, 16 May 2017 23:43:18 +0200 Subject: gnu: ruby: Update to 2.4.0. * gnu/packages/ruby.scm (ruby): Update to 2.4.0. (ruby-2.3): New variable. --- gnu/packages/ruby.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0d4ae1dbb0..4977337517 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -48,8 +48,7 @@ (define-public ruby (package (name "ruby") - (version "2.3.3") - (replacement ruby-2.3.4) + (version "2.4.0") (source (origin (method url-fetch) @@ -58,7 +57,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "1p0rfk0blrbfjcnv0vb0ha4hxflgkfhv9zbzp4vvld2pi31ahkqs")) + "141nnsdk2q83c23p5kl404id8gy1ap261gin48rbjj5sbksgx1rs")) (modules '((guix build utils))) (snippet `(begin ;; Remove bundled libffi @@ -102,11 +101,11 @@ a focus on simplicity and productivity.") (home-page "https://ruby-lang.org") (license license:ruby))) -(define ruby-2.3.4 +(define-public ruby-2.3 (package (inherit ruby) - (name "ruby") (version "2.3.4") + (replacement #f) (source (origin (method url-fetch) -- cgit 1.4.1 From a281accec5922672c3061f234668444ee01fcbf0 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 20:58:18 -0500 Subject: gnu: ruby-json: Update to 2.1.0. * gnu/packages/ruby.scm (ruby-json): Update to 2.1.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 1df7d60a36..d376a7f381 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2436,14 +2436,14 @@ when working with Ruby code.") (define-public ruby-json (package (name "ruby-json") - (version "1.8.3") + (version "2.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "json" version)) (sha256 (base32 - "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc")))) + "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; dependency cycle with sdoc (synopsis "JSON library for Ruby") -- cgit 1.4.1 From b4092cb801e4d4c76cbfc8fbafeba10728ec4f6c Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:08:08 -0500 Subject: gnu: ruby-minitest: Update to 5.10.2. * gnu/packages/ruby.scm (ruby-minitest): Update to 5.10.2. --- 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 d376a7f381..d5fdd5b4fd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1480,13 +1480,13 @@ with processes on remote servers, via SSH2.") (define-public ruby-minitest (package (name "ruby-minitest") - (version "5.10.1") + (version "5.10.2") (source (origin (method url-fetch) (uri (rubygems-uri "minitest" version)) (sha256 (base32 - "1yk2m8sp0p5m1niawa3ncg157a4i0594cg7z91rzjxv963rzrwab")))) + "11my86fnihvpndyknn3c14hc82nhsgggnhlxh8h3bdjpmfsvl0my")))) (build-system ruby-build-system) (native-inputs `(("ruby-hoe" ,ruby-hoe))) -- cgit 1.4.1 From 9a7017ebd5dd5693111a57f72c64f9c38ac7514e Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:37:50 -0500 Subject: gnu: ruby-minitest-4: Exclude failing tests. gnu/packages/ruby.scm (ruby-minitest-4): Exclude failing tests. --- gnu/packages/ruby.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d5fdd5b4fd..a8f21798af 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1513,7 +1513,13 @@ facilities supporting TDD, BDD, mocking, and benchmarking.") (lambda _ (substitute* "Rakefile" (("self\\.rubyforge_name = .*") "")) - #t))))))) + #t)) + (add-after 'build 'exclude-failing-tests + (lambda _ + ;; Some tests are failing on Ruby 2.4 due to the deprecation of + ;; Fixnum. + (delete-file "test/minitest/test_minitest_spec.rb") + #t))))))) (define-public ruby-minitest-sprint (package -- cgit 1.4.1 From fb4074897b403549b603c52881fdf7c9535348ad Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:46:45 -0500 Subject: gnu: bundler: Update to 1.15.1. * gnu/packages/ruby.scm (bundler): Update to 1.15.1. --- 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 a8f21798af..cc996bd865 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -446,13 +446,13 @@ expectations and mocks frameworks.") (define-public bundler (package (name "bundler") - (version "1.14.6") + (version "1.15.1") (source (origin (method url-fetch) (uri (rubygems-uri "bundler" version)) (sha256 (base32 - "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl")))) + "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; avoid dependency cycles -- cgit 1.4.1 From fc29d5e61b5d00004ecb8c53a2a19f64f7f129f2 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 21:56:05 -0500 Subject: gnu: ruby-sdoc: Relax dependency requirement versions. * gnu/packages/ruby.scm (ruby-sdoc)[arguments]: Relax dependency requirement versions. --- gnu/packages/ruby.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cc996bd865..8acd05075c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2229,9 +2229,15 @@ current line in an external editor.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'set-rubylib + (add-before 'check 'set-rubylib-and-patch-gemfile (lambda _ (setenv "RUBYLIB" "lib") + (substitute* "sdoc.gemspec" + (("s.add_runtime_dependency.*") "\n") + (("s.add_dependency.*") "\n")) + (substitute* "Gemfile" + (("gem \"rake\".*") + "gem 'rake'\ngem 'rdoc'\ngem 'json'\n")) #t))))) (propagated-inputs `(("ruby-json" ,ruby-json))) -- cgit 1.4.1 From 3fd577e3c51577403f5e8b7d77286f9ab72581ab Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 22:06:39 -0500 Subject: gnu: ruby-gem-hadar: Update to 1.9.1. * gnu/packages/ruby.scm (ruby-gem-hadar): Update to 1.9.1. [propagated-inputs]: Remove ruby-sdoc, add ruby-yard. [native-inputs]: Remove bundler. --- gnu/packages/ruby.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8acd05075c..60682bcbd7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2285,13 +2285,13 @@ documentation for Ruby code.") (define-public ruby-gem-hadar (package (name "ruby-gem-hadar") - (version "1.3.1") + (version "1.9.1") (source (origin (method url-fetch) (uri (rubygems-uri "gem_hadar" version)) (sha256 (base32 - "1j8qri4m9wf8nbfv0kakrgsv2x8vg10914xgm6f69nw8zi3i39ws")))) + "1zxvd9l95rbks7x3cxn396w0sn7nha5542bf97v8akkn4vm7nby9")))) (build-system ruby-build-system) ;; This gem needs itself at development time. We disable rebuilding of the ;; gemspec to avoid this loop. @@ -2305,9 +2305,7 @@ documentation for Ruby code.") (propagated-inputs `(("git" ,git) ("ruby-tins" ,ruby-tins) - ("ruby-sdoc" ,ruby-sdoc))) - (native-inputs - `(("bundler" ,bundler))) + ("ruby-yard" ,ruby-yard))) (synopsis "Library for the development of Ruby gems") (description "This library contains some useful functionality to support the -- cgit 1.4.1 From 5b884348cc877216f458c0b99371347e0a853799 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 2 Jun 2017 22:23:15 -0500 Subject: gnu: ruby-test-unit: Update to 3.2.4. * gnu/packages/ruby.scm (ruby-test-unit): Update to 3.2.4. --- 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 60682bcbd7..d3196bff2f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1198,13 +1198,13 @@ use GNU gettext tools for maintenance.") (define-public ruby-test-unit (package (name "ruby-test-unit") - (version "3.1.5") + (version "3.2.4") (source (origin (method url-fetch) (uri (rubygems-uri "test-unit" version)) (sha256 (base32 - "0jxznjzwmrlp8wqjxsd06qbiddffn68pdhz6nrqpjbiln1z3af4w")))) + "09mb34lnffracsqxl4dav4c21p5nr4pj9hm5qy2s83k5hbjya3s7")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-power-assert" ,ruby-power-assert))) -- cgit 1.4.1 From 39d4d6f6751bebae3daaeb53785660ea6826fb0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:09:45 +0200 Subject: gnu: ruby-ox: Update to 2.5.0. * gnu/packages/ruby.scm (ruby-ox): Update to 2.5.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 d3196bff2f..27b5c56740 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2706,14 +2706,14 @@ unacceptable HTML and/or CSS from a string.") (define-public ruby-ox (package (name "ruby-ox") - (version "2.2.1") + (version "2.5.0") (source (origin (method url-fetch) (uri (rubygems-uri "ox" version)) (sha256 (base32 - "00i11xd4ayh7349rhgskajfxn0qzkb74ab01217zix9qcapssxax")))) + "0rar0xr5qn3zac1r2z18kmpapx121c2l3z8jsgh60vsddwzpdh7h")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From 71153ef12cac59385f7bfb60970be45425c9e5b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:17:20 +0200 Subject: gnu: ruby-pg: Update to 0.20.0. * gnu/packages/ruby.scm (ruby-pg): Update to 0.20.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 27b5c56740..45f918ffac 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2768,14 +2768,14 @@ alternative to Marshal for Object serialization. ") (define-public ruby-pg (package (name "ruby-pg") - (version "0.18.2") + (version "0.20.0") (source (origin (method url-fetch) (uri (rubygems-uri "pg" version)) (sha256 (base32 - "1axxbf6ij1iqi3i1r3asvjc80b0py5bz0m2wy5kdi5xkrpr82kpf")))) + "03xcgwjs6faxis81jxf2plnlalg55dhhafqv3kvjxfr8ic7plpw5")))) (build-system ruby-build-system) (arguments '(#:test-target "spec")) -- cgit 1.4.1 From a7938625920b65f425d01a46dc28ecc7b1af8a09 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:25:23 +0200 Subject: gnu: ruby-net-ssh: Update to 4.1.0. * gnu/packages/ruby.scm (ruby-net-ssh): Update to 4.1.0. [native-inputs]: Add BUNDLER. --- gnu/packages/ruby.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 45f918ffac..c91be6f6cb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1459,16 +1459,17 @@ allows mocking and stubbing of methods on real (non-mock) classes.") (define-public ruby-net-ssh (package (name "ruby-net-ssh") - (version "3.0.1") + (version "4.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "net-ssh" version)) (sha256 (base32 - "1dzqkgwi9xm6mbfk1rkk17rzmz8m5xakqi21w1b97ybng6kkw0hf")))) + "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q")))) (build-system ruby-build-system) (native-inputs - `(("ruby-mocha" ,ruby-mocha) + `(("bundler" ,bundler) + ("ruby-mocha" ,ruby-mocha) ("ruby-test-unit" ,ruby-test-unit))) (synopsis "Ruby implementation of the SSH2 client protocol") (description "@code{Net::SSH} is a pure-Ruby implementation of the SSH2 -- cgit 1.4.1 From 0899352f970b321c22ff971bb674cb4a131587c9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:46:10 +0200 Subject: gnu: ruby-ansi: Fix build failure with ruby@2.4.0. * gnu/packages/ruby.scm (ruby-ansi)[arguments]<#:phases>: Add 'replace-broken-symlink'. --- gnu/packages/ruby.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c91be6f6cb..868188119c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -3586,7 +3587,19 @@ It has built-in support for the legacy @code{cookies.txt} and ;; be require'd. (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "ansi"))))))) + (zero? (system* "ruby" "-Ilib" "-r" "ansi")))) + (add-before 'validate-runpath 'replace-broken-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (file (string-append out "/lib/ruby/gems/" + ,(package-version ruby) + "/gems/ansi-" ,version + "/lib/ansi.yml"))) + ;; XXX: This symlink is broken since ruby 2.4. + ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html + (delete-file file) + (symlink "../.index" file) + #t)))))) (synopsis "ANSI escape code related libraries") (description "This package is a collection of ANSI escape code related libraries -- cgit 1.4.1 From de6f6efd737e941aa7d6f77032525ea757b2909d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 4 Jun 2017 22:54:40 +0200 Subject: gnu: ruby-ae: Fix build failure with ruby@2.4.0. * gnu/packages/ruby.scm (ruby-ae)[arguments]<#:phases>: Add 'replace-broken-symlink'. --- gnu/packages/ruby.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ruby.scm') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 868188119c..6691095e55 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3788,7 +3788,19 @@ requirement specifications systems like Cucumber.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "qed"))))))) + (lambda _ (zero? (system* "qed")))) + (add-before 'validate-runpath 'replace-broken-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (file (string-append out "/lib/ruby/gems/" + ,(package-version ruby) + "/gems/ae-" ,version + "/lib/ae.yml"))) + ;; XXX: This symlink is broken since ruby 2.4. + ;; https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00034.html + (delete-file file) + (symlink "../.index" file) + #t)))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi))) (native-inputs -- cgit 1.4.1