[bug#41036] ruby: Add 2.7.3.

[bug#41036] ruby: Add 2.7.3.

[Ryan Prior via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 47 bytes --]

This patch adds Ruby 2.7.3, the latest release.

[-- Attachment #1.2: Type: text/html, Size: 334 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-ruby-2.7.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-ruby-2.7.patch", Size: 2277 bytes --]

From 0c10fb29338bc118c3fa442615aa6217960bb03b Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Sat, 2 May 2020 18:17:00 -0500
Subject: [PATCH] gnu: Add ruby-2.7.

---
 gnu/packages/ruby.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 4d6d323442..67f344301c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -128,6 +128,48 @@ a focus on simplicity and productivity.")
     (home-page "https://www.ruby-lang.org")
     (license license:ruby)))
 
+(define-public ruby-2.7
+  (package
+    (inherit ruby)
+    (version "2.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
+                           (version-major+minor version)
+                           "/ruby-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l"))
+       (modules '((guix build utils)))
+       (snippet `(begin
+                   ;; Remove bundled libffi
+                   (delete-file-recursively "ext/fiddle/libffi-3.2.1")
+                   #t))))
+    (arguments
+     `(#:test-target "test"
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'replace-bin-sh-and-remove-libffi
+           (lambda _
+             (substitute* '("configure.ac"
+                            "template/Makefile.in"
+                            "lib/rubygems/installer.rb"
+                            "ext/pty/pty.c"
+                            "io.c"
+                            "lib/mkmf.rb"
+                            "process.c"
+                            "test/rubygems/test_gem_ext_configure_builder.rb"
+                            "test/rdoc/test_rdoc_parser.rb"
+                            "test/ruby/test_rubyoptions.rb"
+                            "test/ruby/test_process.rb"
+                            "test/ruby/test_system.rb"
+                            "tool/rbinstall.rb")
+               (("/bin/sh") (which "sh")))
+             #t)))))
+    (native-inputs
+     `(("autoconf" ,autoconf)))))
+
 (define-public ruby-2.4
   (package
     (inherit ruby)
-- 
2.17.1

[bug#41036] ruby: Add ruby-2.5 as an alias to ruby

[Ryan Prior via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 84 bytes --]

The current ruby in Guix is 2.5, this alias allows to explicitly depend on ruby@2.5.

[-- Attachment #1.2: Type: text/html, Size: 371 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-ruby-2.5-as-an-alias-to-ruby.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-ruby-2.5-as-an-alias-to-ruby.patch", Size: 646 bytes --]

From 1dc232f14c8743fa0bd253ca470ef5f16c6baa0c Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Sat, 2 May 2020 18:18:00 -0500
Subject: [PATCH] gnu: Add ruby-2.5 as an alias to ruby.

---
 gnu/packages/ruby.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 67f344301c..f9e687e775 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -170,6 +170,8 @@ a focus on simplicity and productivity.")
     (native-inputs
      `(("autoconf" ,autoconf)))))
 
+(define-public ruby-2.5 ruby)
+
 (define-public ruby-2.4
   (package
     (inherit ruby)
-- 
2.17.1

[bug#41036] ruby: Update to 2.7.3

[Ryan Prior via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 86 bytes --]

Ruby 2.7.3 is the latest release. This patch updates the ruby package to point to 2.7.

[-- Attachment #1.2: Type: text/html, Size: 373 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-ruby-Update-to-2.7.3.patch --]
[-- Type: text/x-patch; name="0001-gnu-ruby-Update-to-2.7.3.patch", Size: 1079 bytes --]

From 0f61f3897a69e8c1cd46a10dc710028d6de03962 Mon Sep 17 00:00:00 2001
From: Ryan Prior <rprior@protonmail.com>
Date: Sat, 2 May 2020 18:22:31 -0500
Subject: [PATCH] gnu: ruby: Update to 2.7.3.

---
 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 f9e687e775..455469b03c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -74,7 +74,7 @@
   #:use-module (guix build-system ruby)
   #:use-module ((srfi srfi-1) #:select (alist-delete)))
 
-(define-public ruby
+(define-public ruby-2.5
   (package
     (name "ruby")
     (version "2.5.3")
@@ -130,7 +130,7 @@ a focus on simplicity and productivity.")
 
 (define-public ruby-2.7
   (package
-    (inherit ruby)
+    (inherit ruby-2.5)
     (version "2.7.1")
     (source
      (origin
@@ -170,7 +170,7 @@ a focus on simplicity and productivity.")
     (native-inputs
      `(("autoconf" ,autoconf)))))
 
-(define-public ruby-2.5 ruby)
+(define-public ruby ruby-2.7)
 
 (define-public ruby-2.4
   (package
-- 
2.17.1

[bug#41036] ruby: Update to 2.7.3

[Ludovic Courtès]

Hi,

Ryan Prior <rprior@protonmail.com> skribis:

> Ruby 2.7.3 is the latest release. This patch updates the ruby package to point to 2.7.

‘guix refresh -l ruby@2.5’ says there are 4K packages depending on it
(which I didn’t expect).  So this change should probably go to the next
‘core-updates’ according to our guidelines (info "(guix) Submitting
Patches").

Did you have a chance to test the impact of this change on Ruby
packages?  Perhaps you should ping other people who last upgraded Ruby.

Thanks,
Ludo’.

[bug#41036] ruby: Update to 2.7.3

[Ryan Prior via Guix-patches via]

Hi there! I'm Ryan Prior, a rubyist and Guix maintainer. I'm writing you
because I'd like your feedback on my patches to add Ruby 2.7.3 to Guix
and eventually to make that the default version of Ruby. I got your
email address from the Ruby package in Guix master.

You can find my version of the Ruby package here:
https://github.com/ryanprior/guix-packages#ruby

Discussion is in the Guix issue tracker here:
https://issues.guix.gnu.org/issue/41036

Thank you for contributing to Ruby and Guix, I appreciate your time!


Ludovic Courtès (cc'd) <ludo@gnu.org> writes:

> ‘guix refresh -l ruby@2.5’ says there are 4K packages depending on it
> (which I didn’t expect).  So this change should probably go to the next
> ‘core-updates’ according to our guidelines (info "(guix) Submitting
> Patches").

I think it's a high priority to get 2.7 into Guix so people can start
testing it and building off of it, but fine to hold off
making it the default until the next core-update cycle.

> Did you have a chance to test the impact of this change on Ruby
> packages?  Perhaps you should ping other people who last upgraded
> Ruby.

I've tried a few core things like irb and bundler but have yet to
undertake a more serious testing plan.

Thank you for the suggestion Ludo!


Warmly,
Ryan Prior

[bug#41036] ruby: Update to 2.7.3

[Diego Nicola Barbato]

Hey Ryan,

Ryan Prior <rprior@protonmail.com> writes:

> Hi there! I'm Ryan Prior, a rubyist and Guix maintainer. I'm writing you
> because I'd like your feedback on my patches to add Ruby 2.7.3 to Guix
> and eventually to make that the default version of Ruby. I got your
> email address from the Ruby package in Guix master.

The only reason for my copyright line in gnu/packages/ruby.scm is that I
added the package ruby-wayback-machine-downloader [0] for which I used
the importer.  I know almost nothing about Ruby.

You might get more helpful feedback from the people who have contributed
to the Ruby package itself [1].

[...]

HTH,

Diego

[0]: https://git.savannah.gnu.org/cgit/guix.git/log/gnu/packages/ruby.scm?qt=author&q=barbato
[1]: https://git.savannah.gnu.org/cgit/guix.git/log/?qt=grep&q=gnu%3A+ruby%3A

[bug#41036] [EXT] [bug#41036] ruby: Update to 2.7.3

[Thompson, David]

On Sat, May 2, 2020 at 7:35 PM Ryan Prior via Guix-patches via
<guix-patches@gnu.org> wrote:
>
> Ruby 2.7.3 is the latest release. This patch updates the ruby package to point to 2.7.

According to the Ruby releases page the latest release is 2.7.1, not
2.7.3. Am I missing something?

https://www.ruby-lang.org/en/downloads/releases/

- Dave

[bug#41036] [EXT] [bug#41036] ruby: Update to 2.7.3

[Ryan Prior via Guix-patches via]

Thompson, David <dthompson2@worcester.edu> writes:

> On Sat, May 2, 2020 at 7:35 PM Ryan Prior via Guix-patches via
> <guix-patches@gnu.org> wrote:
>>
>> Ruby 2.7.3 is the latest release. This patch updates the ruby package to point to 2.7.
>
> According to the Ruby releases page the latest release is 2.7.1, not
> 2.7.3. Am I missing something?

Hi David, I think I got confused when writing my email to debbugs. The
package says 2.7.1, which is correct, and all references in email
correspondence and patch titles to 2.7.3 should have been to 2.7.1.

Thank you for the correction!

Ryan

[bug#41036] ruby: Add 2.7.3.

[Christopher Baines]

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


Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:

> This patch adds Ruby 2.7.3, the latest release.

Hi Ryan,

Thanks for the patch, I've tweaked this to also pass --enable-shared to
ruby-2.7, as that's done for Ruby 2.6. I've pushed this to the master
branch as [1].

1: 1cc7d3404f8b6b9bf0407e4c752c38fcc188cdba

Perhaps we can use this bug now to track getting Ruby 2.7 as the default
Ruby in Guix. As Ludo said in a previous message, that'll need to happen
on core-updates, which I'll start looking in to...

Thanks again,

Chris

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

[bug#41036] ruby: Add 2.7.3.

[Ludovic Courtès]

Hi Christopher,

Christopher Baines <mail@cbaines.net> skribis:

> Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:
>
>> This patch adds Ruby 2.7.3, the latest release.
>
> Hi Ryan,
>
> Thanks for the patch, I've tweaked this to also pass --enable-shared to
> ruby-2.7, as that's done for Ruby 2.6. I've pushed this to the master
> branch as [1].
>
> 1: 1cc7d3404f8b6b9bf0407e4c752c38fcc188cdba
>
> Perhaps we can use this bug now to track getting Ruby 2.7 as the default
> Ruby in Guix. As Ludo said in a previous message, that'll need to happen
> on core-updates, which I'll start looking in to...

Would now be a good time to apply it?

Thanks,
Ludo’.

[bug#41036] ruby: Add 2.7.3.

[Christopher Baines]

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


Ludovic Courtès <ludo@gnu.org> writes:

> Hi Christopher,
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>> Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:
>>
>>> This patch adds Ruby 2.7.3, the latest release.
>>
>> Hi Ryan,
>>
>> Thanks for the patch, I've tweaked this to also pass --enable-shared to
>> ruby-2.7, as that's done for Ruby 2.6. I've pushed this to the master
>> branch as [1].
>>
>> 1: 1cc7d3404f8b6b9bf0407e4c752c38fcc188cdba
>>
>> Perhaps we can use this bug now to track getting Ruby 2.7 as the default
>> Ruby in Guix. As Ludo said in a previous message, that'll need to happen
>> on core-updates, which I'll start looking in to...
>
> Would now be a good time to apply it?

Yep, I've tried just now, but I was unsuccessful. Unfortunately I'm not
familiar with dealing with patches, and I couldn't seem to get this one
to apply at all.

Ryan, would you be able to rebase the relevant commit and share an
updated patch, that might help me apply it. Also, if there's a branch I
can pull from, that works as well.

Thanks,

Chris

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

[bug#41036] [PATCH 0/2] New patches to update Ruby to 2.7

[Ryan Prior via Guix-patches via]

Here are the new patches you asked for, they should apply cleanly to master.

Ryan Prior (2):
  gnu: Renames ruby to ruby-2.6.
  gnu: Ruby: Update to 2.7.

 gnu/packages/ruby.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
2.26.2

[bug#41036] [PATCH 1/2] gnu: Renames ruby to ruby-2.6.

[Ryan Prior via Guix-patches via]

* gnu/packages/ruby.scm (ruby): Rename to ruby-2.6.
* gnu/packages/ruby.scm (ruby-2.7): Inherit from ruby-2.6.
* gnu/packages/ruby.scm (ruby-2.5): Inherit from ruby-2.6.
* gnu/packages/ruby.scm (ruby-2.4): Inherit from ruby-2.6.
---
 gnu/packages/ruby.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 08c55e4e3c..a0fae70cc6 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -75,7 +75,7 @@
   #:use-module (guix build-system ruby)
   #:use-module ((srfi srfi-1) #:select (alist-delete)))
 
-(define-public ruby
+(define-public ruby-2.6
   (package
     (name "ruby")
     (version "2.6.5")
@@ -133,7 +133,7 @@ a focus on simplicity and productivity.")
 
 (define-public ruby-2.7
   (package
-    (inherit ruby)
+    (inherit ruby-2.6)
     (version "2.7.1")
     (source
      (origin
@@ -176,7 +176,7 @@ a focus on simplicity and productivity.")
 
 (define-public ruby-2.5
   (package
-    (inherit ruby)
+    (inherit ruby-2.6)
     (version "2.5.8")
     (source
      (origin
@@ -195,7 +195,7 @@ a focus on simplicity and productivity.")
 
 (define-public ruby-2.4
   (package
-    (inherit ruby)
+    (inherit ruby-2.6)
     (version "2.4.10")
     (source
      (origin
@@ -212,6 +212,8 @@ a focus on simplicity and productivity.")
                    (delete-file-recursively "ext/fiddle/libffi-3.2.1")
                    #t))))))
 
+(define-public ruby ruby-2.6)
+
 (define-public mruby
   (package
     (name "mruby")
-- 
2.26.2

[bug#41036] [PATCH 2/2] gnu: Ruby: Update to 2.7.

[Ryan Prior via Guix-patches via]

* gnu/packages/ruby.scm (ruby): Update to 2.7.
---
 gnu/packages/ruby.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index a0fae70cc6..b76b5fe411 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -212,7 +212,7 @@ a focus on simplicity and productivity.")
                    (delete-file-recursively "ext/fiddle/libffi-3.2.1")
                    #t))))))
 
-(define-public ruby ruby-2.6)
+(define-public ruby ruby-2.7)
 
 (define-public mruby
   (package
-- 
2.26.2

bug#41036: [PATCH 0/2] New patches to update Ruby to 2.7

[Christopher Baines]

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


Ryan Prior via Guix-patches via <guix-patches@gnu.org> writes:

> Here are the new patches you asked for, they should apply cleanly to master.
>
> Ryan Prior (2):
>   gnu: Renames ruby to ruby-2.6.
>   gnu: Ruby: Update to 2.7.
>
>  gnu/packages/ruby.scm | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

Great, thanks.

I've tweaked the commit messages a bit, and now pushed these patches to
core-updates.

I think the way ruby-2.7 inherits from ruby-2.6 is a bit odd, but I like
that this change is small in terms of the diff. Anyway, how to lay out
the package definitions is a lesser issue compared to what's actually
defined.

Now comes the challenge of actually fixing all the packages this change
will have broken. If updates to packages that fix issues with Ruby 2.7
don't cause too many rebuilds or break anything on master, then pushing
those to master is good. The master branch can then be merged in to
core-updates to get those changes applied there as well. Otherwise, the
fixes should be applied to core-updates.

Thanks,

Chris

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