From: ludo@gnu.org (Ludovic Courtès)
To: Ben Woodcroft <b.woodcroft@uq.edu.au>
Cc: Guix-devel <Guix-devel@gnu.org>
Subject: [PATCH] Update Ruby to 2.3.0
Date: Fri, 08 Jan 2016 17:52:00 +0100 [thread overview]
Message-ID: <87wprkggjz.fsf_-_@gnu.org> (raw)
In-Reply-To: <568F9AA9.7040605@uq.edu.au> (Ben Woodcroft's message of "Fri, 8 Jan 2016 21:16:57 +1000")
Ben Woodcroft <b.woodcroft@uq.edu.au> skribis:
> From 28dee96b0de99adf8657457660b9e3733434d2b4 Mon Sep 17 00:00:00 2001
> From: Ben Woodcroft <donttrustben@gmail.com>
> Date: Mon, 4 Jan 2016 09:38:42 +1000
> Subject: [PATCH 4/4] gnu: ruby: Update to 2.3.0.
>
> * gnu/packages/ruby.scm (ruby): Update to 2.3.0.
Please mention the switch to ‘modify-phases’ here.
> (ruby-2.2): New variable.
[...]
> + (substitute* "ext/fiddle/libffi-3.2.1/configure"
> + (("SHELL = /bin/sh")
> + (string-append "SHELL = " (which "sh"))))
I overlooked this part before but: (1) this looks weird (the spaces
around ‘=’ suggest it’s Makefile syntax, not shell syntax), and (2) we
shouldn’t use the bundled libffi.
How much work would it be to fix #2? It would be awesome if you could
do that. Sorry for the extra work!
> +(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
> + '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"))))
> + %standard-phases)))))
AFAICS all of ‘arguments’ can be omitted once the above libffi
substitution is removed.
(If it there’s still a need for different phases, it should use
‘substitute-keyword-arguments’ to modify only #:phases, and then
‘modify-phases’ rather than ‘alist-cons-before’.)
Could you send an updated patch, hopefully the last one? :-)
Thanks,
Ludo’.
next prev parent reply other threads:[~2016-01-08 16:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-03 14:35 Freezing core-updates soon Ludovic Courtès
2016-01-03 16:25 ` Ricardo Wurmus
2016-01-03 22:27 ` Ludovic Courtès
2016-01-04 14:20 ` Mark H Weaver
2016-01-04 21:16 ` Mark H Weaver
2016-01-04 22:49 ` Ludovic Courtès
2016-01-04 0:59 ` Thompson, David
2016-01-04 1:17 ` Ben Woodcroft
2016-01-04 10:46 ` [PATCH] Update Ruby to 2.3.0 (was Re: Freezing core-updates soon) Ben Woodcroft
2016-01-05 22:24 ` Ludovic Courtès
2016-01-08 11:16 ` Ben Woodcroft
2016-01-08 16:52 ` Ludovic Courtès [this message]
2016-01-10 12:53 ` [PATCH] Update Ruby to 2.3.0 Ben Woodcroft
2016-01-10 12:56 ` Ben Woodcroft
2016-01-10 21:14 ` Ludovic Courtès
2016-01-11 12:52 ` Ben Woodcroft
2016-01-04 11:02 ` Freezing core-updates soon Efraim Flashner
2016-01-04 15:13 ` Ludovic Courtès
2016-01-04 15:21 ` Efraim Flashner
2016-01-13 17:48 ` Ludovic Courtès
2016-01-14 20:10 ` Mark H Weaver
2016-01-15 16:13 ` Ludovic Courtès
2016-01-19 10:34 ` util-linux test failure Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wprkggjz.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=Guix-devel@gnu.org \
--cc=b.woodcroft@uq.edu.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.