all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#39120] [00/12] Update Ruby to 2.6.
@ 2020-01-13 20:30 Christopher Baines
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
  2020-01-13 22:59 ` [bug#39120] [00/12] Update Ruby to 2.6 Marius Bakke
  0 siblings, 2 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 20:30 UTC (permalink / raw)
  To: 39120

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

So, these patches are a bit late, 2.7 is already out, but it's a bit to
early to update to 2.7, so let's just do 2.6, then add a package for
2.7.


Christopher Baines (12):
  gnu: ruby-listen: Update to 3.2.0.
  gnu: ruby-aruba: Update to 0.14.14.
  gnu: ruby-childprocess-0.6: Remove version 0.6.3.
  gnu: ruby-childprocess: Update to 3.0.0.
  gnu: ruby-yard: Update to 0.9.20.
  gnu: ruby-hoe: Update to 3.21.0.
  gnu: ruby-power-assert: Update to 1.1.5.
  gnu: ruby-json-pure: Update to 2.2.0.
  gnu: ruby-tzinfo: Skip safe tests.
  gnu: ruby-2.4: Update to 2.4.9.
  gnu: ruby: Update to 2.6.5.
  gnu: Add ruby-2.5.

 gnu/packages/ruby.scm | 123 +++++++++++++++++++++++++++---------------
 1 file changed, 80 insertions(+), 43 deletions(-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0.
  2020-01-13 20:30 [bug#39120] [00/12] Update Ruby to 2.6 Christopher Baines
@ 2020-01-13 22:53 ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 02/12] gnu: ruby-aruba: Update to 0.14.14 Christopher Baines
                     ` (10 more replies)
  2020-01-13 22:59 ` [bug#39120] [00/12] Update Ruby to 2.6 Marius Bakke
  1 sibling, 11 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ad675dc488..b8a5c8b5d3 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4548,7 +4548,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
@@ -4560,7 +4560,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"
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 02/12] gnu: ruby-aruba: Update to 0.14.14.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 03/12] gnu: ruby-childprocess-0.6: Remove version 0.6.3 Christopher Baines
                     ` (9 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b8a5c8b5d3..de10a25c5b 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -5405,14 +5405,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"
@@ -5444,11 +5444,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'"))
@@ -5458,7 +5454,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)
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 03/12] gnu: ruby-childprocess-0.6: Remove version 0.6.3.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 02/12] gnu: ruby-aruba: Update to 0.14.14 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 04/12] gnu: ruby-childprocess: Update to 3.0.0 Christopher Baines
                     ` (8 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index de10a25c5b..f1fa9310eb 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7424,17 +7424,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))
@@ -7449,19 +7449,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")
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 04/12] gnu: ruby-childprocess: Update to 3.0.0.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 02/12] gnu: ruby-aruba: Update to 0.14.14 Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 03/12] gnu: ruby-childprocess-0.6: Remove version 0.6.3 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 05/12] gnu: ruby-yard: Update to 0.9.20 Christopher Baines
                     ` (7 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* 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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index f1fa9310eb..d7c9383b45 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -7427,14 +7427,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))
@@ -7446,7 +7446,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
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 05/12] gnu: ruby-yard: Update to 0.9.20.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (2 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 04/12] gnu: ruby-childprocess: Update to 3.0.0 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 06/12] gnu: ruby-hoe: Update to 3.21.0 Christopher Baines
                     ` (6 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* 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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index d7c9383b45..140cdb9aab 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -5747,7 +5747,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)
@@ -5758,20 +5758,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
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 06/12] gnu: ruby-hoe: Update to 3.21.0.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (3 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 05/12] gnu: ruby-yard: Update to 0.9.20 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 07/12] gnu: ruby-power-assert: Update to 1.1.5 Christopher Baines
                     ` (5 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* 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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 140cdb9aab..e8861d4a19 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -297,14 +297,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,
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 07/12] gnu: ruby-power-assert: Update to 1.1.5.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (4 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 06/12] gnu: ruby-hoe: Update to 3.21.0 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 08/12] gnu: ruby-json-pure: Update to 2.2.0 Christopher Baines
                     ` (4 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* 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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index e8861d4a19..2cd9f36aa8 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -2256,14 +2256,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")
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 08/12] gnu: ruby-json-pure: Update to 2.2.0.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (5 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 07/12] gnu: ruby-power-assert: Update to 1.1.5 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 09/12] gnu: ruby-tzinfo: Skip safe tests Christopher Baines
                     ` (3 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* 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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2cd9f36aa8..b39769acaa 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4462,13 +4462,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
@@ -4502,7 +4502,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
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 09/12] gnu: ruby-tzinfo: Skip safe tests.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (6 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 08/12] gnu: ruby-json-pure: Update to 2.2.0 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 10/12] gnu: ruby-2.4: Update to 2.4.9 Christopher Baines
                     ` (2 subsequent siblings)
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

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(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b39769acaa..088b975a22 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -4072,6 +4072,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")
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 10/12] gnu: ruby-2.4: Update to 2.4.9.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (7 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 09/12] gnu: ruby-tzinfo: Skip safe tests Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 11/12] gnu: ruby: Update to 2.6.5 Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 12/12] gnu: Add ruby-2.5 Christopher Baines
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* gnu/packages/ruby.scm (ruby-2.4): Update to 2.4.9.
---
 gnu/packages/ruby.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 088b975a22..2a7bec40bc 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -131,7 +131,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)
@@ -140,8 +140,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
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 11/12] gnu: ruby: Update to 2.6.5.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (8 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 10/12] gnu: ruby-2.4: Update to 2.4.9 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  2020-01-13 22:53   ` [bug#39120] [PATCH 12/12] gnu: Add ruby-2.5 Christopher Baines
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

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(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2a7bec40bc..a4def037f2 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -77,7 +77,7 @@
 (define-public ruby
   (package
     (name "ruby")
-    (version "2.5.3")
+    (version "2.6.5")
     (source
      (origin
        (method url-fetch)
@@ -86,7 +86,7 @@
                            "/ruby-" version ".tar.xz"))
        (sha256
         (base32
-         "0vrhrw7kcz9mg0jkqnihkcxqy5k05v8k1j0y2735z8wfk8sx1j8w"))
+         "0qhsw2mr04f3lqinkh557msr35pb5rdaqy4vdxcj91flgxqxmmnm"))
        (modules '((guix build utils)))
        (snippet `(begin
                    ;; Remove bundled libffi
@@ -116,8 +116,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")
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [PATCH 12/12] gnu: Add ruby-2.5.
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
                     ` (9 preceding siblings ...)
  2020-01-13 22:53   ` [bug#39120] [PATCH 11/12] gnu: ruby: Update to 2.6.5 Christopher Baines
@ 2020-01-13 22:53   ` Christopher Baines
  10 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-01-13 22:53 UTC (permalink / raw)
  To: 39120

* gnu/packages/ruby.scm (ruby-2.5): New variable.
---
 gnu/packages/ruby.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index a4def037f2..68634d8100 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -129,6 +129,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)
-- 
2.24.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [bug#39120] [00/12] Update Ruby to 2.6.
  2020-01-13 20:30 [bug#39120] [00/12] Update Ruby to 2.6 Christopher Baines
  2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
@ 2020-01-13 22:59 ` Marius Bakke
  2020-01-14  7:31   ` Christopher Baines
  1 sibling, 1 reply; 17+ messages in thread
From: Marius Bakke @ 2020-01-13 22:59 UTC (permalink / raw)
  To: Christopher Baines, 39120

[-- Attachment #1: Type: text/plain, Size: 752 bytes --]

Christopher Baines <mail@cbaines.net> writes:

> So, these patches are a bit late, 2.7 is already out, but it's a bit to
> early to update to 2.7, so let's just do 2.6, then add a package for
> 2.7.
>
>
> Christopher Baines (12):
>   gnu: ruby-listen: Update to 3.2.0.
>   gnu: ruby-aruba: Update to 0.14.14.
>   gnu: ruby-childprocess-0.6: Remove version 0.6.3.
>   gnu: ruby-childprocess: Update to 3.0.0.
>   gnu: ruby-yard: Update to 0.9.20.
>   gnu: ruby-hoe: Update to 3.21.0.
>   gnu: ruby-power-assert: Update to 1.1.5.
>   gnu: ruby-json-pure: Update to 2.2.0.
>   gnu: ruby-tzinfo: Skip safe tests.
>   gnu: ruby-2.4: Update to 2.4.9.
>   gnu: ruby: Update to 2.6.5.
>   gnu: Add ruby-2.5.

Thanks!  This is for 'core-updates', right?  LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [bug#39120] [00/12] Update Ruby to 2.6.
  2020-01-13 22:59 ` [bug#39120] [00/12] Update Ruby to 2.6 Marius Bakke
@ 2020-01-14  7:31   ` Christopher Baines
  2020-01-14 23:53     ` Christopher Baines
  0 siblings, 1 reply; 17+ messages in thread
From: Christopher Baines @ 2020-01-14  7:31 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 39120

[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]


Marius Bakke <mbakke@fastmail.com> writes:

> Christopher Baines <mail@cbaines.net> writes:
>
>> So, these patches are a bit late, 2.7 is already out, but it's a bit to
>> early to update to 2.7, so let's just do 2.6, then add a package for
>> 2.7.
>>
>>
>> Christopher Baines (12):
>>   gnu: ruby-listen: Update to 3.2.0.
>>   gnu: ruby-aruba: Update to 0.14.14.
>>   gnu: ruby-childprocess-0.6: Remove version 0.6.3.
>>   gnu: ruby-childprocess: Update to 3.0.0.
>>   gnu: ruby-yard: Update to 0.9.20.
>>   gnu: ruby-hoe: Update to 3.21.0.
>>   gnu: ruby-power-assert: Update to 1.1.5.
>>   gnu: ruby-json-pure: Update to 2.2.0.
>>   gnu: ruby-tzinfo: Skip safe tests.
>>   gnu: ruby-2.4: Update to 2.4.9.
>>   gnu: ruby: Update to 2.6.5.
>>   gnu: Add ruby-2.5.
>
> Thanks!  This is for 'core-updates', right?  LGTM.

Yeah, I was waiting until I got the Guix Data Service to compare the
differences (it's still a bit broken, but I'm trying to get my patch
testing setup working again [1]).

1: https://laminar.cbaines.net/jobs/patchwork-test-series/190

At least with [2], the number is 3861 rebuilds, which means core-updates
I think.

2: ./pre-inst-env guix refresh -l ruby@2.4 ruby@2.5 ruby@2.6 ruby-tzinfo
ruby-json-pure ruby-power-assert ruby-hoe ruby-yard ruby-childprocess
ruby-aruba ruby-listen

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [bug#39120] [00/12] Update Ruby to 2.6.
  2020-01-14  7:31   ` Christopher Baines
@ 2020-01-14 23:53     ` Christopher Baines
  2020-05-09  7:39       ` bug#39120: " Christopher Baines
  0 siblings, 1 reply; 17+ messages in thread
From: Christopher Baines @ 2020-01-14 23:53 UTC (permalink / raw)
  To: Marius Bakke; +Cc: 39120

[-- Attachment #1: Type: text/plain, Size: 1519 bytes --]


Christopher Baines <mail@cbaines.net> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Christopher Baines <mail@cbaines.net> writes:
>>
>>> So, these patches are a bit late, 2.7 is already out, but it's a bit to
>>> early to update to 2.7, so let's just do 2.6, then add a package for
>>> 2.7.
>>>
>>>
>>> Christopher Baines (12):
>>>   gnu: ruby-listen: Update to 3.2.0.
>>>   gnu: ruby-aruba: Update to 0.14.14.
>>>   gnu: ruby-childprocess-0.6: Remove version 0.6.3.
>>>   gnu: ruby-childprocess: Update to 3.0.0.
>>>   gnu: ruby-yard: Update to 0.9.20.
>>>   gnu: ruby-hoe: Update to 3.21.0.
>>>   gnu: ruby-power-assert: Update to 1.1.5.
>>>   gnu: ruby-json-pure: Update to 2.2.0.
>>>   gnu: ruby-tzinfo: Skip safe tests.
>>>   gnu: ruby-2.4: Update to 2.4.9.
>>>   gnu: ruby: Update to 2.6.5.
>>>   gnu: Add ruby-2.5.
>>
>> Thanks!  This is for 'core-updates', right?  LGTM.
>
> Yeah, I was waiting until I got the Guix Data Service to compare the
> differences (it's still a bit broken, but I'm trying to get my patch
> testing setup working again [1]).
>
> 1: https://laminar.cbaines.net/jobs/patchwork-test-series/190
>
> At least with [2], the number is 3861 rebuilds, which means core-updates
> I think.
>
> 2: ./pre-inst-env guix refresh -l ruby@2.4 ruby@2.5 ruby@2.6 ruby-tzinfo
> ruby-json-pure ruby-power-assert ruby-hoe ruby-yard ruby-childprocess
> ruby-aruba ruby-listen

I've gone ahead and pushed to core-updates as
227fab3ed8842b22337196ee21c79143fc093855.

Thanks for taking a look :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* bug#39120: [00/12] Update Ruby to 2.6.
  2020-01-14 23:53     ` Christopher Baines
@ 2020-05-09  7:39       ` Christopher Baines
  0 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2020-05-09  7:39 UTC (permalink / raw)
  To: 39120-done

[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]


Christopher Baines <mail@cbaines.net> writes:

> Christopher Baines <mail@cbaines.net> writes:
>
>> Marius Bakke <mbakke@fastmail.com> writes:
>>
>>> Christopher Baines <mail@cbaines.net> writes:
>>>
>>>> So, these patches are a bit late, 2.7 is already out, but it's a bit to
>>>> early to update to 2.7, so let's just do 2.6, then add a package for
>>>> 2.7.
>>>>
>>>>
>>>> Christopher Baines (12):
>>>>   gnu: ruby-listen: Update to 3.2.0.
>>>>   gnu: ruby-aruba: Update to 0.14.14.
>>>>   gnu: ruby-childprocess-0.6: Remove version 0.6.3.
>>>>   gnu: ruby-childprocess: Update to 3.0.0.
>>>>   gnu: ruby-yard: Update to 0.9.20.
>>>>   gnu: ruby-hoe: Update to 3.21.0.
>>>>   gnu: ruby-power-assert: Update to 1.1.5.
>>>>   gnu: ruby-json-pure: Update to 2.2.0.
>>>>   gnu: ruby-tzinfo: Skip safe tests.
>>>>   gnu: ruby-2.4: Update to 2.4.9.
>>>>   gnu: ruby: Update to 2.6.5.
>>>>   gnu: Add ruby-2.5.
>>>
>>> Thanks!  This is for 'core-updates', right?  LGTM.
>>
>> Yeah, I was waiting until I got the Guix Data Service to compare the
>> differences (it's still a bit broken, but I'm trying to get my patch
>> testing setup working again [1]).
>>
>> 1: https://laminar.cbaines.net/jobs/patchwork-test-series/190
>>
>> At least with [2], the number is 3861 rebuilds, which means core-updates
>> I think.
>>
>> 2: ./pre-inst-env guix refresh -l ruby@2.4 ruby@2.5 ruby@2.6 ruby-tzinfo
>> ruby-json-pure ruby-power-assert ruby-hoe ruby-yard ruby-childprocess
>> ruby-aruba ruby-listen
>
> I've gone ahead and pushed to core-updates as
> 227fab3ed8842b22337196ee21c79143fc093855.
>
> Thanks for taking a look :)

core-updates has now been merged, so I'm closing this.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2020-05-09  7:39 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-13 20:30 [bug#39120] [00/12] Update Ruby to 2.6 Christopher Baines
2020-01-13 22:53 ` [bug#39120] [PATCH 01/12] gnu: ruby-listen: Update to 3.2.0 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 02/12] gnu: ruby-aruba: Update to 0.14.14 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 03/12] gnu: ruby-childprocess-0.6: Remove version 0.6.3 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 04/12] gnu: ruby-childprocess: Update to 3.0.0 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 05/12] gnu: ruby-yard: Update to 0.9.20 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 06/12] gnu: ruby-hoe: Update to 3.21.0 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 07/12] gnu: ruby-power-assert: Update to 1.1.5 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 08/12] gnu: ruby-json-pure: Update to 2.2.0 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 09/12] gnu: ruby-tzinfo: Skip safe tests Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 10/12] gnu: ruby-2.4: Update to 2.4.9 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 11/12] gnu: ruby: Update to 2.6.5 Christopher Baines
2020-01-13 22:53   ` [bug#39120] [PATCH 12/12] gnu: Add ruby-2.5 Christopher Baines
2020-01-13 22:59 ` [bug#39120] [00/12] Update Ruby to 2.6 Marius Bakke
2020-01-14  7:31   ` Christopher Baines
2020-01-14 23:53     ` Christopher Baines
2020-05-09  7:39       ` bug#39120: " 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.