Re: ghc 8

[ng0 <ngillmann@runbox.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1445 bytes --]

ng0 <ng0@we.make.ritual.n0.is> writes:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> ng0 <ng0@we.make.ritual.n0.is> skribis:
>>
>>> Ludovic Courtès <ludo@gnu.org> writes:
>>>
>>>> ng0 <ng0@we.make.ritual.n0.is> skribis:
>>>>
>>>>> should we package ghc 8 in core-updates? It was released in May:
>>>>> https://ghc.haskell.org/trac/ghc/blog/ghc-8.0.1-released
>>>>
>>>> Probably a good idea.  :-)
>>>>
>>>> This can be done in ‘master’, or, if we change to default GHC, to a
>>>> dedicated ‘ghc-update’ branch.
>>>>
>>>> Ludo’.
>>>
>>> Should this replace current ghc? I don't know how much of our current
>>> (gnu packages haskell) would break.
>>
>> No idea.  I suppose we take this route:
>>
>>   1. First you test a sample of ghc-* packages and build them to see if
>>      there’s obvious breakage.
>>
>>   2. If not, we commit the GHC upgrade in a branch and let Hydra build
>>      the branch.
>>
>>   3. We fix package breaks that we notice on the branch.
>>
>>   4. Merge the branch.
>>
>> How does that sound?
>>
>> Ludo’.
>
> Sounds good to me.

Dropping this as I need to focus on my bigger projects.
I realize this is better for our in-house haskell experts to pick up and
solve. Feel free to apply and use. If this no longer applies to master
(this is a branch which does not yet include the 1000+ new lines to
haskell.scm), I can send a rebased copy of the patches.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-ghc-ghc-bootstrap-x86_64-7.8.4-Update-to-8.0.1.patch --]
[-- Type: text/x-patch, Size: 1229 bytes --]

From c96b71f8bd32f7085fb1f774ea677ddfde8fcdc8 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Mon, 5 Sep 2016 10:57:23 +0000
Subject: [PATCH 1/4] gnu: ghc: ghc-bootstrap-x86_64-7.8.4: Update to 8.0.1.

* gnu/packages/haskell.scm (ghc-bootstrap-x86_64-7.8.4): Update to 8.0.1 and
replace with (ghc-bootstrap-x86_64-8.0.1).
---
 gnu/packages/haskell.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 87628b5..6e9ddf4 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -50,14 +50,14 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
-(define ghc-bootstrap-x86_64-7.8.4
+(define ghc-bootstrap-x86_64-8.0.1
   (origin
     (method url-fetch)
     (uri
-     "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-x86_64-unknown-linux-deb7.tar.xz")
+     "https://www.haskell.org/ghc/dist/8.0.1/ghc-8.0.1-x86_64-deb7-linux.tar.xz")
     (sha256
      (base32
-      "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn"))))
+      "19rh4bpmrjwm75msk706n7zaycnjq1rd1ncf0kh01h2fzafi1a46"))))
 
 (define ghc-bootstrap-i686-7.8.4
   (origin
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-ghc-ghc-bootstrap-i386-7.8.4-Update-to-8.0.1.patch --]
[-- Type: text/x-patch, Size: 1214 bytes --]

From 5c2ed52d447ad56926451a56a36f935a9d7c002f Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Mon, 5 Sep 2016 11:09:12 +0000
Subject: [PATCH 2/4]  gnu: ghc: ghc-bootstrap-i386-7.8.4: Update to 8.0.1.

* gnu/packages/haskell.scm (ghc-bootstrap-i386-7.8.4): Update to 8.0.1 and
replace with (ghc-bootstrap-i386-8.0.1).
---
 gnu/packages/haskell.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6e9ddf4..5b9e662 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -59,14 +59,14 @@
      (base32
       "19rh4bpmrjwm75msk706n7zaycnjq1rd1ncf0kh01h2fzafi1a46"))))
 
-(define ghc-bootstrap-i686-7.8.4
+(define ghc-bootstrap-i686-8.0.1
   (origin
     (method url-fetch)
     (uri
-     "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-i386-unknown-linux-deb7.tar.xz")
+     "https://www.haskell.org/ghc/dist/8.0.1/ghc-8.0.1-i386-deb7-linux.tar.xz")
     (sha256
      (base32
-      "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg"))))
+      "0zshnl69jygg0hms38f6fcyf3cbwbmd4dzp27ybby7bkr6gc25xf"))))
 
 ;; 43 tests out of 3965 fail.
 ;;
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-gnu-ghc-Update-to-8.0.1.patch --]
[-- Type: text/x-patch, Size: 3195 bytes --]

From 2c33f126cb18b4ec532888a4ca4974a278d9ce24 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Mon, 5 Sep 2016 11:16:51 +0000
Subject: [PATCH 3/4] gnu: ghc: Update to 8.0.1.

* gnu/packages/haskell.scm (ghc): Update to 8.0.1.
---
 gnu/packages/haskell.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 5b9e662..d629d43 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -85,7 +85,7 @@
 (define-public ghc
   (package
     (name "ghc")
-    (version "7.10.2")
+    (version "8.0.1")
     (source
      (origin
       (method url-fetch)
@@ -93,7 +93,7 @@
                           version "/" name "-" version "-src.tar.xz"))
       (sha256
        (base32
-        "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"))))
+        "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh"))))
     (build-system gnu-build-system)
     (supported-systems '("i686-linux" "x86_64-linux"))
     (outputs '("out" "doc"))
@@ -110,7 +110,7 @@
                  version "/" name "-" version "-testsuite.tar.xz"))
            (sha256
             (base32
-             "0qp9da9ar87zbyn6wjgacd2ic1vgzbi3cklxnhsmjqyafv9qaj4b"))))))
+             "0lc1vjivkxn01aw3jg2gd7fmqb5pj7a5j987c7pn5r7caqv1cmxw"))))))
     (native-inputs
      `(("perl" ,perl)
        ("python" ,python-2)                ; for tests (fails with python-3)
@@ -119,8 +119,8 @@
        ;; GHC is built with GHC. Therefore we need bootstrap binaries.
        ("ghc-binary"
         ,(if (string-match "x86_64" (or (%current-target-system) (%current-system)))
-             ghc-bootstrap-x86_64-7.8.4
-             ghc-bootstrap-i686-7.8.4))))
+             ghc-bootstrap-x86_64-8.0.1
+             ghc-bootstrap-i686-8.0.1))))
     (arguments
      `(#:test-target "test"
        ;; We get a smaller number of test failures by disabling parallel test
@@ -213,9 +213,9 @@
                                            ,(glibc-dynamic-linker)))
                      (libtinfo-dir
                       (string-append ghc-bootstrap-prefix
-                                     "/lib/ghc-7.8.4/terminfo-0.4.0.0")))
+                                     "/lib/ghc-8.0.1/terminfo-0.4.0.0")))
                 (with-directory-excursion
-                    (string-append ghc-bootstrap-path "/ghc-7.8.4")
+                    (string-append ghc-bootstrap-path "/ghc-8.0.1")
                   (setenv "CONFIG_SHELL" (which "bash"))
                   (setenv "LD_LIBRARY_PATH" gmp-lib)
                   ;; The binaries have "/lib64/ld-linux-x86-64.so.2" hardcoded.
@@ -243,7 +243,7 @@
              'configure 'install-bin
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (with-directory-excursion
-                   (string-append ghc-bootstrap-path "/ghc-7.8.4")
+                   (string-append ghc-bootstrap-path "/ghc-8.0.1")
                  (zero? (system* "make" "install"))))
              %standard-phases)))))))
     (native-search-paths (list (search-path-specification
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.5: 0004-gnu-ghc-Partial-fix-to-terminfo.patch --]
[-- Type: text/x-patch, Size: 1368 bytes --]

From 69e8e3ddb131f2919f7a5c3420ac724d5eb5ec6b Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sun, 11 Sep 2016 17:29:16 +0000
Subject: [PATCH 4/4] gnu: ghc: Partial fix to terminfo.

This will be reworked when commited upstream.
---
 gnu/packages/haskell.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index d629d43..fdcb4cb 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -113,6 +113,7 @@
              "0lc1vjivkxn01aw3jg2gd7fmqb5pj7a5j987c7pn5r7caqv1cmxw"))))))
     (native-inputs
      `(("perl" ,perl)
+       ("lua" ,lua)
        ("python" ,python-2)                ; for tests (fails with python-3)
        ("ghostscript" ,ghostscript)        ; for tests
        ("patchelf" ,patchelf)
@@ -213,7 +214,7 @@
                                            ,(glibc-dynamic-linker)))
                      (libtinfo-dir
                       (string-append ghc-bootstrap-prefix
-                                     "/lib/ghc-8.0.1/terminfo-0.4.0.0")))
+                                     "/lib/ghc-8.0.1/terminfo-0.4.0.2")))
                 (with-directory-excursion
                     (string-append ghc-bootstrap-path "/ghc-8.0.1")
                   (setenv "CONFIG_SHELL" (which "bash"))
-- 
2.10.0


[-- Attachment #1.6: Type: text/plain, Size: 26 bytes --]


-- 
              ng0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]