diff options
| author | Ben Woodcroft <donttrustben@gmail.com> | 2016-01-04 09:38:42 +1000 |
|---|---|---|
| committer | Ben Woodcroft <donttrustben@gmail.com> | 2016-01-11 21:59:06 +1000 |
| commit | 65e84e317633ce3126d87d4dc731a119aaaebf70 (patch) | |
| tree | 34e541e7cad1c3c1ade818fffd9262b34f976346 /gnu/packages/ruby.scm | |
| parent | 9656b8bec5730b5da2b4633564b26ff3a1e92d8b (diff) | |
| download | guix-65e84e317633ce3126d87d4dc731a119aaaebf70.tar.gz | |
gnu: ruby: Update to 2.3.0.
* gnu/packages/ruby.scm (ruby): Update to 2.3.0. [source]: Remove bundled libffi. [arguments]: Use parallel tests. (ruby-2.2): New variable.
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2fac187fd9..2977f94660 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,19 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "0g3ps4q3iz7wj9m45n8xyxzw8nh29ljdqb87b0f6i0p3853gz2yj")))) + "15s0dsb5ynf3d2w5gzawnszq5594fqvapv2y7a0qw16przq5l4kh")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively + (string-append "ext/fiddle/libffi-3.2.1")) + #t)))) (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" @@ -95,6 +100,25 @@ 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")) + (modules '((guix build utils))) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively + (string-append "ext/fiddle/libffi-3.2.1")) + #t)))))) + (define-public ruby-2.1 (package (inherit ruby) (version "2.1.6") |