me
/
guix
Archived
1
0
Fork 0

gnu: ruby: Update to 2.1.4.

* gnu/packages/ruby.scm: Update.  Remove the now redundant readline patch.
master
David Thompson 2014-10-31 18:57:30 -04:00
parent d8805b95f5
commit 12d39eb514
1 changed files with 18 additions and 25 deletions

View File

@ -36,44 +36,37 @@
(define-public ruby (define-public ruby
(package (package
(name "ruby") (name "ruby")
(version "2.1.3") (version "2.1.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://cache.ruby-lang.org/pub/ruby/" (uri (string-append "http://cache.ruby-lang.org/pub/ruby/"
(version-major+minor version) (version-major+minor version)
"/ruby-" version ".tar.bz2")) "/ruby-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1mkndw0by11n6lyvq7dzly702yyqg5x0fcvfqrn9y4p49bw75kin")))) "1ksgx1rn4wp80290399q6d26zpbx0nb3sxh45wl4wr58raxmrk71"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:parallel-tests? #f #:parallel-tests? #f
#:phases #:phases
(alist-cons-after (alist-cons-before
;; Minor patch: 'configure 'replace-bin-sh
;; https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/45225/diff/
'unpack 'patch-readline
(lambda _ (lambda _
(substitute* '("ext/readline/readline.c") (substitute* '("Makefile.in"
(("Function ") "rl_hook_func_t "))) "ext/pty/pty.c"
(alist-cons-before "io.c"
'configure 'replace-bin-sh "lib/mkmf.rb"
(lambda _ "process.c"
(substitute* '("Makefile.in" "test/rubygems/test_gem_ext_configure_builder.rb"
"ext/pty/pty.c" "test/rdoc/test_rdoc_parser.rb"
"io.c" "test/ruby/test_rubyoptions.rb"
"lib/mkmf.rb" "test/ruby/test_process.rb"
"process.c" "test/ruby/test_system.rb"
"test/rubygems/test_gem_ext_configure_builder.rb" "tool/rbinstall.rb")
"test/rdoc/test_rdoc_parser.rb" (("/bin/sh") (which "sh"))))
"test/ruby/test_rubyoptions.rb" %standard-phases)))
"test/ruby/test_process.rb"
"test/ruby/test_system.rb"
"tool/rbinstall.rb")
(("/bin/sh") (which "sh"))))
%standard-phases))))
(inputs (inputs
`(("readline" ,readline) `(("readline" ,readline)
("openssl" ,openssl) ("openssl" ,openssl)