From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark H Weaver <mhw@netris.org>
Subject: Re: [PATCH 3/3] gnu: Add ghc.
Date: Tue, 31 Mar 2015 15:31:38 -0400
Message-ID: <87a8ytc6at.fsf@netris.org>
References: <CAKrPhPNQf66zQtBB-vUNa_9QBZ8m8SmtggMBRNuXm70f5YTK9w@mail.gmail.com>
	<87384sg4ey.fsf@gnu.org>
	<CAKrPhPMJD1bEu-zRyryy8QfY5cFS2jG6BLTBhcwyp+fOzeVzTA@mail.gmail.com>
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]:37951)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1Yd1sc-0003Fj-OI
	for guix-devel@gnu.org; Tue, 31 Mar 2015 15:31:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1Yd1sW-000701-TY
	for guix-devel@gnu.org; Tue, 31 Mar 2015 15:31:18 -0400
In-Reply-To: <CAKrPhPMJD1bEu-zRyryy8QfY5cFS2jG6BLTBhcwyp+fOzeVzTA@mail.gmail.com>
	(Federico Beffa's message of "Sat, 28 Mar 2015 20:15:07 +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: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>

Federico Beffa <beffa@ieee.org> writes:

> From 52b593fd287a76b6a7ab04e5a3dc82bf4dc72d6b Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Sat, 28 Mar 2015 20:09:37 +0100
> Subject: [PATCH] gnu: ghc: Fix i686 build.
>
> * gnu/packages/haskell.scm (ghc-bootstrap-7.8.4, ghc): Split
>   'ghc-bootstrap-7.8.4' into 'ghc-bootstrap-i686-7.8.4' and
>   'ghc-bootstrap-x86_64-7.8.4'. Select the appropriate input in 'ghc'.

How about this instead:

* gnu/packages/haskell.scm (ghc-bootstrap-7.8.4): Replace with ...
  (ghc-bootstrap-x86_64-7.8.4, ghc-bootstrap-i686-7.8.4): ... these.
  (ghc)[native-inputs]: Select the appropriate bootstrap.

> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 183d0eb..46a4b4f 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -33,22 +33,23 @@
>    #:use-module (gnu packages ncurses)
>    #:use-module (gnu packages python))
>  
> -;; We use bootstrap binaries with a fix version which can be used to build
> -;; more versions of the GHC compiler.
> -(define ghc-bootstrap-7.8.4
> +(define ghc-bootstrap-x86_64-7.8.4
>    (origin
>      (method url-fetch)
> -    (uri (string-append "https://www.haskell.org/ghc/dist/"
> -                        "7.8.4/ghc-7.8.4-"
> -                        (if (string-match "x86_64" (%current-system))
> -                            "x86_64"
> -                            "i386")
> -                        "-unknown-linux-deb7.tar.xz"))
> +    (uri
> +     "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-x86_64-unknown-linux-deb7.tar.xz")
>      (sha256
>       (base32
> -      (if (string-match "x86_64" (%current-system))
> -          "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn"
> -          "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg")))))
> +          "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn"))))

Now that the 'if' is gone, please indent the hash so that the open quote
is under the 'b' in 'base32'.

Otherwise it looks good to me.  Okay to push with these changes.

    Thanks!
      Mark