Re: [PATCH] Update lisp.scm CCL and SBCL to latest versions

[Christopher W Carpenter <mordocai@mordocai.net>]

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


Acidentally sent this just to Efraim the first time, sorry you'll get it
twice...

Thanks for the feedback, I think I've fixed all the issues in the
(actually attached) patches included here.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-sbcl-Update-to-1.3.2.patch --]
[-- Type: text/x-diff, Size: 2109 bytes --]

From cc280d52f5d7724c86ce365e541330fd85c3dcd0 Mon Sep 17 00:00:00 2001
From: "Christopher W. Carpenter (https://mordocai.net/gpg.html)"
 <mordocai@mordocai.net>
Date: Wed, 10 Feb 2016 18:45:56 -0600
Subject: [PATCH 1/2] gnu: sbcl: Update to 1.3.2

* gnu/packages/lisp.cm (sbcl): Update to 1.3.2
[arguments]: Delete test that breaks compilation.
---
 gnu/packages/lisp.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 85f3f3c..32884d5 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -209,14 +209,14 @@ an interpreter, a compiler, a debugger, and much more.")
 (define-public sbcl
   (package
     (name "sbcl")
-    (version "1.2.8")
+    (version "1.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
                            version "-source.tar.bz2"))
        (sha256
-        (base32 "0ab9lw056yf6y0rjmx3iirn5n59pmssqxf00fbmpyl6qsnpaja1d"))))
+        (base32 "18mgj1h9wqi0zq4k7y5r5fk10mlbpgh3796d3dac75bpxabg30nk"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     ;; Bootstrap with CLISP.
@@ -243,7 +243,10 @@ an interpreter, a compiler, a debugger, and much more.")
                ;; occurs in some .sh files too (which contain Lisp code).  Use
                ;; ISO-8859-1 because some of the files are ISO-8859-1 encoded.
                (with-fluids ((%default-port-encoding #f))
-                 (substitute* (find-files "." "\\.(lisp|sh)$")
+                 ;; Delete file that breaks. Due guile's regex parser?
+                 (substitute* (delete
+                               "./tests/data/compile-file-pos-utf16be.lisp"
+                               (find-files "." "\\.(lisp|sh)$"))
                    (("\"/bin/sh\"") (quoted-path bash "/bin/sh"))
                    (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env"))
                    (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat"))
-- 
2.6.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-ccl-Update-to-1.11.patch --]
[-- Type: text/x-diff, Size: 2008 bytes --]

From 2f65ec025d583cdfedcdec101c2121cf9f34fa37 Mon Sep 17 00:00:00 2001
From: "Christopher W. Carpenter (https://mordocai.net/gpg.html)"
 <mordocai@mordocai.net>
Date: Wed, 10 Feb 2016 19:00:08 -0600
Subject: [PATCH 2/2] gnu: ccl: Update to 1.11

* gnu/packages/lisp.scm (ccl): Update to 1.11.
---
 gnu/packages/lisp.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 32884d5..30cd089 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -318,7 +318,7 @@ statistical profiler, a code coverage tool, and many other extensions.")
 (define-public ccl
   (package
     (name "ccl")
-    (version "1.10")
+    (version "1.11")
     (source #f)
     (build-system gnu-build-system)
     ;; CCL consists of a "lisp kernel" and "heap image", both of which are
@@ -331,7 +331,8 @@ statistical profiler, a code coverage tool, and many other extensions.")
         ,(origin
            (method url-fetch)
            (uri (string-append
-                 "ftp://ftp.clozure.com/pub/release/1.10/ccl-" version "-"
+                 "ftp://ftp.clozure.com/pub/release/" version
+                 "/ccl-" version "-"
                  (match (%current-system)
                    ((or "i686-linux" "x86_64-linux") "linuxx86")
                    ("armhf-linux" "linuxarm")
@@ -343,9 +344,9 @@ statistical profiler, a code coverage tool, and many other extensions.")
             (base32
              (match (%current-system)
                ((or "i686-linux" "x86_64-linux")
-                "0mr653q5px05lr11z2mk551m5g47b4wq96vbfibpp0qlc9jp58lc")
+                "0w3dmj7q9kqyra3yrf1lxclnjz151yvf5s5q8ayllvmvqbl8bs08")
                ("armhf-linux"
-                "1py02irpmi2qz5rq3h33wfv6impf15z8i2rign6hvhlqn7s99wwh")
+                "1x487aaz2rqcb6k301sy2p39a1m4qdhg6z9p9fb76ssipqgr38b4")
                (_ ""))))))))
     (native-inputs
      `(("m4" ,m4)
-- 
2.6.3


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