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

[Efraim Flashner <efraim@flashner.co.il>]

[-- Attachment #1: Type: text/plain, Size: 5851 bytes --]

On Wed, 10 Feb 2016 19:36:41 -0600
Christopher W Carpenter <mordocai@mordocai.net> wrote:

> From: Christopher W Carpenter <mordocai@mordocai.net>
> To: guix-devel@gnu.org
> Subject: [PATCH] Update lisp.scm CCL and SBCL to latest versions
> Date: Wed, 10 Feb 2016 19:36:41 -0600
> Sender: guix-devel-bounces+efraim=flashner.co.il@gnu.org
> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
> 
> 
> I don't have another machine to check for reproducibility right now, but
> I believe i've done everything else specified by the contributing
> section of the manual.
> 
> Each version upgrade is a separate attachment.

somehow they ended up inline in the email here.

> 
> ===File
> /home/mordocai/git_repos/guix/0001-Update-lisp.scm-sbcl-package-to-version-1.3.2.patch===
> From 39e7c9ef9a323fb4b97c138318c20cb869120bd5 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] Update lisp.scm sbcl package to version 1.3.2
> 
> The error with the ./tests/data/compile-with-pos-utf16be.lisp file is
> very strange and I plan on looking into it more.

I can't tell exactly with the patches inline, but the commit message should be:

gnu: sbcl: Update to 1.3.2.

* gnu/packages/lisp.scm (sbcl): Update to 1.3.2.
[arguments]: Delete test that breaks compilation.

> ---
>  gnu/packages/lisp.scm | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
> index 85f3f3c..daba49e 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,9 @@ 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"
the above line looks like it's more than 80 characters

> +                                      (find-files "." "\\.(lisp|sh)$"))
>                     (("\"/bin/sh\"") (quoted-path bash "/bin/sh"))
>                     (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env"))
this line also looks too long

>                     (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat"))


> ============================================================

> ===File
> /home/mordocai/git_repos/guix/0002-Update-lisp.scm-ccl-package-to- version-1.11.patch===
> From 5da335ea49aac640828d366aa693dbf28d414639 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] Update lisp.scm ccl package to version 1.11

same thing here with the commit message

> ---
>  gnu/packages/lisp.scm | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
> index daba49e..26d54e1 100644
> --- a/gnu/packages/lisp.scm
> +++ b/gnu/packages/lisp.scm
> @@ -317,7 +317,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
> @@ -330,7 +330,7 @@ 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")
> @@ -342,9 +342,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.7.0
>
> ============================================================


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]