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ès <l...@gnu.org> wrote:
Hi!
I would like to declare ‘core-updates’ frozen in 1 or 2 days so we can
have Hydra build it all and merge it afterwards.
Thoughts?
If there’s a big update you’d like to make (Python anyone?), 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
download sources e.g. http://graphviz.org/ seems to be down. Ruby seems
to build though, can we just review as normal and then push to core-updates?
I did rebuild all the packages in ruby.scm, and out of these about 1/3
of packages failed to build, because at least these three packages'
tests fail
* yard
* power_assert
* minitest_tu_shim
The first two presumably will be fixed upstream soon, but the third
hasn't seen a release since Aug 2013, and the homepage listed on
rubygems is dead. I guess we just have to encourage the only package we
have packaged that uses tu_shim (term-ansicolor) to stop relying on it.
Thanks,
ben
>From cd8c4e078cb930d1ce928b3c614b2081ec6719ac Mon Sep 17 00:00:00 2001
From: Ben Woodcroft <donttrust...@gmail.com>
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
