From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul van der Walt Subject: [PATCH 01/43] gnu: ghc: Update to 7.10.2. Date: Thu, 15 Oct 2015 14:20:55 +0200 Message-ID: <1444911697-15515-1-git-send-email-paul@denknerd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmhXo-0002S1-Tm for guix-devel@gnu.org; Thu, 15 Oct 2015 08:22:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmhXj-0006dA-Qr for guix-devel@gnu.org; Thu, 15 Oct 2015 08:22:04 -0400 Received: from mx01.mykolab.com ([95.128.36.1]:48106 helo=mx-out03.mykolab.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmhXj-0006cC-K3 for guix-devel@gnu.org; Thu, 15 Oct 2015 08:21:59 -0400 Received: from mx03.mykolab.com (mx03.mykolab.com [10.20.7.101]) by mx-out03.mykolab.com (Postfix) with ESMTPS id 226A5234F9 for ; Thu, 15 Oct 2015 14:21:56 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: guix-devel@gnu.org * gnu/packages/haskell.scm (ghc): Update to 7.10.2. Correct bootstrap compiler path. --- gnu/packages/haskell.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 34cad87..ba828d8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Federico Beffa ;;; Copyright =C2=A9 2015 Sini=C5=A1a Bi=C4=91in +;;; Copyright =C2=A9 2015 Paul van der Walt ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,7 +74,7 @@ (define-public ghc (package (name "ghc") - (version "7.8.4") + (version "7.10.2") (source (origin (method url-fetch) @@ -81,7 +82,7 @@ version "/" name "-" version "-src.tar.xz")) (sha256 (base32 - "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3")))) + "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (outputs '("out" "doc")) @@ -98,7 +99,7 @@ version "/" name "-" version "-testsuite.tar.xz")) (sha256 (base32 - "0q95whf87y4mxjzwzy899g7z7l9pazq4si6iciyhxkcdhqq2ycyh")))))= ) + "0qp9da9ar87zbyn6wjgacd2ic1vgzbi3cklxnhsmjqyafv9qaj4b")))))= ) (native-inputs `(("perl" ,perl) ("python" ,python-2) ; for tests (fails with pytho= n-3) @@ -203,7 +204,7 @@ (string-append ghc-bootstrap-prefix "/lib/ghc-7.8.4/terminfo-0.4.0.0"))= ) (with-directory-excursion - (string-append ghc-bootstrap-path "/" ,name "-" ,ver= sion) + (string-append ghc-bootstrap-path "/ghc-7.8.4") (setenv "CONFIG_SHELL" (which "bash")) (setenv "LD_LIBRARY_PATH" gmp-lib) ;; The binaries have "/lib64/ld-linux-x86-64.so.2" har= dcoded. @@ -231,7 +232,7 @@ 'configure 'install-bin (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion - (string-append ghc-bootstrap-path "/" ,name "-" ,vers= ion) + (string-append ghc-bootstrap-path "/ghc-7.8.4") (zero? (system* "make" "install")))) %standard-phases))))))) (home-page "https://www.haskell.org/ghc") --=20 2.6.1