From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark H Weaver <mhw@netris.org>
Subject: Re: [PATCH] gnu: Add ruby 1.8.7
Date: Sun, 26 Oct 2014 19:33:51 -0400
Message-ID: <87wq7mpfs0.fsf@yeeloong.lan>
References: <20141026203111.GA20849@thebird.nl>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42883)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1XiXKz-0004IP-1S
	for guix-devel@gnu.org; Sun, 26 Oct 2014 19:35:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1XiXKu-0007HQ-1v
	for guix-devel@gnu.org; Sun, 26 Oct 2014 19:35:04 -0400
In-Reply-To: <20141026203111.GA20849@thebird.nl> (Pjotr Prins's message of
	"Sun, 26 Oct 2014 21:31:11 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Pjotr Prins <pjotr.public12@thebird.nl>
Cc: guix-devel@gnu.org

Pjotr Prins <pjotr.public12@thebird.nl> writes:
>     * gnu/packages/ruby.scm: Added older Ruby 1.8.7

According to our conventions, this should be:

* gnu/packages/ruby.scm (ruby-1.8): New variable.

> ---
>  gnu/packages/ruby.scm |   27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>
> diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
> index ac751f5..31cbe54 100644
> --- a/gnu/packages/ruby.scm
> +++ b/gnu/packages/ruby.scm
> @@ -89,6 +89,33 @@ a focus on simplicity and productivity.")
>      (home-page "https://ruby-lang.org")
>      (license license:ruby)))
>  
> +(define-public ruby-1.8
> +  (package (inherit ruby)
> +    (name "ruby")

Is there a reason to repeat the 'name' field here?
It should be inherited.

> +    (version "1.8.7-p374")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "ftp://ftp.ruby-lang.org/pub/ruby/1.8/"
> +                           name "-" version ".tar.bz2"))

In the ruby-2.1.3 package description, we used the http URI starting
with "http://cache.ruby-lang.org/pub/ruby/".  It's probably better to
use that one, since 'http' has some advantages and our http client is
more robust.

> +     (sha256
> +      (base32
> +       "1qq7khilwkayrhwmzlxk83scrmiqfi7lgsn4c63znyvz2c1lgqxl"))))
> +    (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")
> +             (("/bin/sh") (which "sh"))))
> +         %standard-phases)))))

It looks like the 'native-search-paths' field needs to be overridden,
since the existing one has "2.1.3" in it.

     Thanks!
       Mark