From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Woodcroft Subject: [PATCH] Update Ruby to 2.3.0 (was Re: Freezing core-updates soon) Date: Mon, 4 Jan 2016 20:46:54 +1000 Message-ID: <568A4D9E.3030504@uq.edu.au> References: <87wprqspc3.fsf@gnu.org> <5689C833.3050608@uq.edu.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000404060903050708060400" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aG2fL-0002Ki-5N for Guix-devel@gnu.org; Mon, 04 Jan 2016 05:47:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aG2fG-0006GB-Fw for Guix-devel@gnu.org; Mon, 04 Jan 2016 05:47:07 -0500 In-Reply-To: <5689C833.3050608@uq.edu.au> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "Thompson, David" , =?UTF-8?Q?Ludovic_Court=c3=a8s?= Cc: Guix-devel This is a multi-part message in MIME format. --------------000404060903050708060400 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by newmailhub.uq.edu.au id u04AkuTG013231 On 04/01/16 11:17, Ben Woodcroft wrote: > On 04/01/16 10:59, Thompson, David wrote: >> On Sun, Jan 3, 2016 at 9:35 AM, Ludovic Court=C3=A8s wr= ote: >>> Hi! >>> >>> I would like to declare =E2=80=98core-updates=E2=80=99 frozen in 1 or= 2 days so we can >>> have Hydra build it all and merge it afterwards. >>> >>> Thoughts? >>> >>> If there=E2=80=99s a big update you=E2=80=99d like to make (Python an= yone?), now is >>> the time! >> I don't have the time to do it, but if anyone would like to bump Ruby >> to 2.3.0 and keep the 2.2.4 version hanging around in another variable >> like the other old versions, that would be cool. :) > I'm on it, draft patch done, rebuilding dependencies now. I had some trouble downloading dependencies because of inability to=20 download sources e.g. http://graphviz.org/ seems to be down. Ruby seems=20 to build though, can we just review as normal and then push to core-updat= es? I did rebuild all the packages in ruby.scm, and out of these about 1/3=20 of packages failed to build, because at least these three packages'=20 tests fail * yard * power_assert * minitest_tu_shim The first two presumably will be fixed upstream soon, but the third=20 hasn't seen a release since Aug 2013, and the homepage listed on=20 rubygems is dead. I guess we just have to encourage the only package we=20 have packaged that uses tu_shim (term-ansicolor) to stop relying on it. Thanks, ben --------------000404060903050708060400 Content-Type: text/x-patch; name="0001-gnu-ruby-Update-to-2.3.0.patch" Content-Disposition: attachment; filename="0001-gnu-ruby-Update-to-2.3.0.patch" Content-Transfer-Encoding: 7bit >From cd8c4e078cb930d1ce928b3c614b2081ec6719ac Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 4 Jan 2016 09:38:42 +1000 Subject: [PATCH] gnu: ruby: Update to 2.3.0. * gnu/packages/ruby.scm (ruby): Update to 2.3.0. (ruby-2.2): New variable. --- gnu/packages/ruby.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 47ac392..2888914 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -46,7 +46,7 @@ (define-public ruby (package (name "ruby") - (version "2.2.4") + (version "2.3.0") (source (origin (method url-fetch) @@ -55,10 +55,62 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")))) + "15s0dsb5ynf3d2w5gzawnszq5594fqvapv2y7a0qw16przq5l4kh")))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-before 'configure 'replace-bin-sh + (lambda _ + (substitute* '("Makefile.in" + "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"))) + (substitute* "ext/fiddle/libffi-3.2.1/configure" + (("SHELL = /bin/sh") + (string-append "SHELL = " (which "sh")))) + #t))))) + (inputs + `(("readline" ,readline) + ("openssl" ,openssl) + ("libffi" ,libffi) + ("gdbm" ,gdbm) + ("zlib" ,zlib))) + (native-search-paths + (list (search-path-specification + (variable "GEM_PATH") + (files (list (string-append "lib/ruby/gems/" + (version-major+minor version) + ".0")))))) + (synopsis "Programming language interpreter") + (description "Ruby is a dynamic object-oriented programming language with +a focus on simplicity and productivity.") + (home-page "https://ruby-lang.org") + (license license:ruby))) + +(define-public ruby-2.2 + (package (inherit ruby) + (version "2.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://cache.ruby-lang.org/pub/ruby/" + (version-major+minor version) + "/ruby-" version ".tar.bz2")) + (sha256 + (base32 + "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")))) + (arguments + `(#:test-target "test" #:parallel-tests? #f #:phases (alist-cons-before @@ -88,12 +140,7 @@ (variable "GEM_PATH") (files (list (string-append "lib/ruby/gems/" (version-major+minor version) - ".0")))))) - (synopsis "Programming language interpreter") - (description "Ruby is a dynamic object-oriented programming language with -a focus on simplicity and productivity.") - (home-page "https://ruby-lang.org") - (license license:ruby))) + ".0")))))))) (define-public ruby-2.1 (package (inherit ruby) -- 2.6.3 --------------000404060903050708060400--