From 2f26295b5a163cfc5d37332a501dcba5c40fb956 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 4 Jan 2016 09:38:42 +1000 Subject: [PATCH 5/5] gnu: ruby: Update to 2.3.0. * gnu/packages/ruby.scm (ruby): Update to 2.3.0. [arguments]: Remove bundled libffi. Use parallel tests. (ruby-2.2): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2b7496a..d2cdcf0 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,14 +55,13 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")))) + "15s0dsb5ynf3d2w5gzawnszq5594fqvapv2y7a0qw16przq5l4kh")))) (build-system gnu-build-system) (arguments `(#:test-target "test" - #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-before 'configure 'replace-bin-sh + (add-before 'configure 'replace-bin-sh-and-remove-libffi (lambda _ (substitute* '("Makefile.in" "ext/pty/pty.c" @@ -76,6 +75,9 @@ "test/ruby/test_system.rb" "tool/rbinstall.rb") (("/bin/sh") (which "sh"))) + ;; Remove bundled libffi + (delete-file-recursively + (string-append "ext/fiddle/libffi-3.2.1")) #t))))) (inputs `(("readline" ,readline) @@ -95,6 +97,19 @@ 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.xz")) + (sha256 + (base32 + "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")))))) + (define-public ruby-2.1 (package (inherit ruby) (version "2.1.6") -- 2.6.3