[bug#73056] [PATCH 1/2] gnu: cl-ciel: Update to 0.2.1

[bug#73056] [PATCH 1/2] gnu: cl-ciel: Update to 0.2.1

[Konrad Hinsen]

* gnu/packages/lisp-xyz.scm (sbcl-ciel, cl-ciel, ecl-ciel): Update to 0.2.1

Change-Id: Ie0a122ebdba4f9b5bb83275cc349864d0306c080
---
 gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 64ffd93e60..c22d5f6565 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -3462,20 +3462,20 @@ (define-public ecl-chunga
   (sbcl-package->ecl-package sbcl-chunga))
 
 (define-public sbcl-ciel
-  (let ((commit "6cc1cef5e37e9f495c8163271a5de48de99f348a")
-        (revision "0"))
+  (let ((commit "0b26d64dcd91a3a2aa962842629a853261dd30fe")
+        (version "0.2.1"))
     (package
       (name "sbcl-ciel")
-      (version (git-version "0.1.0" revision commit))
+      (version version)
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/ciel-lang/CIEL")
                (commit commit)))
-         (file-name (git-file-name "ciel" version))
+         (file-name (git-file-name name version))
          (sha256
-          (base32 "1bwafbbsppxqvijf43dii55mpzrklh6faj2m5dhajg2f2m8qckgi"))))
+          (base32 "0gm8slnz4jw98rkijnh2dp6x629xdnfk8z7j35g03j6ypr56v06h"))))
       (build-system asdf-build-system/sbcl)
       (native-inputs
        (list sbcl-fiveam))
@@ -3485,12 +3485,11 @@ (define-public sbcl-ciel
              sbcl-arrow-macros
              sbcl-bordeaux-threads
              sbcl-cl-ansi-text
-             sbcl-cl-ansi-text
              sbcl-cl-cron
              sbcl-cl-csv
+             sbcl-cl-ftp
              sbcl-cl-json-pointer
              sbcl-cl-ppcre
-             sbcl-cl-punch
              sbcl-cl-reexport
              sbcl-cl-str
              sbcl-clesh
@@ -3499,12 +3498,11 @@ (define-public sbcl-ciel
              sbcl-cmd
              sbcl-dbi
              sbcl-defstar
-             sbcl-deploy
              sbcl-dexador
              sbcl-dissect
              sbcl-easy-routes
+             sbcl-file-finder
              sbcl-file-notify
-             sbcl-fn
              sbcl-for
              sbcl-fset
              sbcl-generic-cl
@@ -3515,20 +3513,23 @@ (define-public sbcl-ciel
              sbcl-lquery
              sbcl-metabang-bind
              sbcl-modf
+             sbcl-moira
              sbcl-named-readtables
-             sbcl-nodgui
              sbcl-parse-float
              sbcl-parse-number
              sbcl-printv
+             sbcl-progressons
              sbcl-pythonic-string-reader
              sbcl-quicksearch
              sbcl-quri
              sbcl-repl-utilities
+             sbcl-secret-values
              sbcl-serapeum
              sbcl-shasht
              sbcl-shlex
              sbcl-spinneret
              sbcl-sxql
+             sbcl-termp
              sbcl-trivia
              sbcl-trivial-arguments
              sbcl-trivial-do
@@ -3537,6 +3538,17 @@ (define-public sbcl-ciel
              sbcl-trivial-types
              sbcl-vgplot
              sbcl-which))
+      (outputs '("out" "image"))
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'create-asdf-configuration 'build-image
+              (lambda* (#:key outputs #:allow-other-keys)
+                (build-image
+                 (string-append (assoc-ref outputs "image") "/bin/ciel")
+                 outputs
+                 #:dependencies '("ciel")))))))
       (home-page "http://ciel-lang.org/")
       (synopsis "CIEL Is an Extended Lisp")
       (description

base-commit: 386a1c77aff0fe8e298feac5187553c20e47d56e
-- 
2.45.2

[bug#73056] [PATCH 1/2] gnu: cl-ciel: Update to 0.2.1

[Guillaume Le Vaillant]

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

Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:

> diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
> index 64ffd93e60..c22d5f6565 100644
> --- a/gnu/packages/lisp-xyz.scm
> +++ b/gnu/packages/lisp-xyz.scm
> @@ -3462,20 +3462,20 @@ (define-public ecl-chunga
>    (sbcl-package->ecl-package sbcl-chunga))
>  
>  (define-public sbcl-ciel
>  [...]
> +      (outputs '("out" "image"))
> +      (arguments
> +       (list
> +        #:phases
> +        #~(modify-phases %standard-phases
> +            (add-after 'create-asdf-configuration 'build-image
> +              (lambda* (#:key outputs #:allow-other-keys)
> +                (build-image
> +                 (string-append (assoc-ref outputs "image") "/bin/ciel")
> +                 outputs
> +                 #:dependencies '("ciel")))))))
>        (home-page "http://ciel-lang.org/")
>        (synopsis "CIEL Is an Extended Lisp")
>        (description

Hi.
Is building the core image useful, given that the sbcl-ciel-repl package
will contain the binary with the same included features?
If yes, it would be better to put it in the "lib/" directory instead of
"bin/" (e.g. SBCL puts the default core image in "lib/sbcl/").

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

[bug#73056] [PATCH 1/2] gnu: cl-ciel: Update to 0.2.1

[Konrad Hinsen]

Guillaume Le Vaillant <glv@posteo.net> writes:

> Is building the core image useful, given that the sbcl-ciel-repl package
> will contain the binary with the same included features?

The CIEL REPL is specifically meant for use in the terminal, whereas the
core image is recommended by upstream for use with Emacs/Slime and
similar environments.

> If yes, it would be better to put it in the "lib/" directory instead of
> "bin/" (e.g. SBCL puts the default core image in "lib/sbcl/").

I have no strong opinions on the location. There is only one other
package in Guix that builds a core image. That's sbcl-slynk, and it
puts the image under /bin, so I did the same.

There is some justification to this choice because the images are
actually executable. You can use either

   bin/ciel.image

or

   sbcl --core bin/ciel.image

with the same effect.

As I said, I don't care much, but I think it would be preferable to have
a uniform policy about this in Guix, now that we have two packages that
build images :-)

Cheers,
  Konrad.

bug#73056: [PATCH 1/2] gnu: cl-ciel: Update to 0.2.1

[Guillaume Le Vaillant]

Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:

> Guillaume Le Vaillant <glv@posteo.net> writes:
>
>> Is building the core image useful, given that the sbcl-ciel-repl package
>> will contain the binary with the same included features?
>
> The CIEL REPL is specifically meant for use in the terminal, whereas the
> core image is recommended by upstream for use with Emacs/Slime and
> similar environments.
>
>> If yes, it would be better to put it in the "lib/" directory instead of
>> "bin/" (e.g. SBCL puts the default core image in "lib/sbcl/").
>
> I have no strong opinions on the location. There is only one other
> package in Guix that builds a core image. That's sbcl-slynk, and it
> puts the image under /bin, so I did the same.
>
> There is some justification to this choice because the images are
> actually executable. You can use either
>
>    bin/ciel.image
>
> or
>
>    sbcl --core bin/ciel.image
>
> with the same effect.
>
> As I said, I don't care much, but I think it would be preferable to have
> a uniform policy about this in Guix, now that we have two packages that
> build images :-)
>
> Cheers,
>   Konrad.

Ok. Patch applied as 904f871378337b7c9e6ffa2b62d9a62a6d1e937d.
Thanks.