[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[André A. Gomes]

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

Hi Guix,

Please find the patch attached.  Thanks!

-- 
André A. Gomes
"You cannot even find the ruins..."

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-slime-Update-to-2.28-0.1e4b741.patch --]
[-- Type: text/x-patch, Size: 1868 bytes --]

From 2a5b2b845c0a9446d22803bf90d46741b78cee5b Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Thu, 21 Sep 2023 23:46:55 +0300
Subject: [PATCH 1/2] gnu: emacs-slime: Update to 2.28-0.1e4b741.

* gnu/packages/emacs-xyz.scm (emacs-slime): Update to 2.28-0.1e4b741.
---
 gnu/packages/emacs-xyz.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c4de0e1d1f..3640f3aca6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9814,18 +9814,21 @@ (define-public emacs-tagedit
     (license license:gpl3+)))
 
 (define-public emacs-slime
-  (package
+  ;; Update together with sbcl-slime-swank.
+  (let ((commit "1e4b7417a1ade842ba4938f66445af68a93176b9")
+        (revision "0"))
+    (package
     (name "emacs-slime")
-    (version "2.28")
+    (version (git-version "2.28" revision commit))
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/slime/slime")
-             (commit (string-append "v" version))))
+             (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll"))))
+        (base32 "17fs4wjplcxwbgsqzawwnw45xw6rdyyqk3f7dqck7pfazpzziizp"))))
     (build-system emacs-build-system)
     (arguments
      (list
@@ -9875,7 +9878,7 @@ (define-public emacs-slime
 While lisp-mode supports editing Lisp source files, @command{slime-mode}
 adds support for interacting with a running Common Lisp process
 for compilation, debugging, documentation lookup, and so on.")
-    (license (list license:gpl2+ license:public-domain))))
+    (license (list license:gpl2+ license:public-domain)))))
 
 (define-public emacs-popup
   (package
-- 
2.41.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-sbcl-slime-swank-Update-to-2.28-0.1e4b741.patch --]
[-- Type: text/x-patch, Size: 5453 bytes --]

From 00613aca02a1c84e773a723d42bb57351c1fec33 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Thu, 21 Sep 2023 23:48:27 +0300
Subject: [PATCH 2/2] gnu: sbcl-slime-swank: Update to 2.28-0.1e4b741.

* gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.28-0.1e4b741.
---
 gnu/packages/lisp-xyz.scm | 92 ++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 752b777ed2..dc9abd7d31 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -3521,59 +3521,61 @@ (define-public ecl-pythonic-string-reader
   (sbcl-package->ecl-package sbcl-pythonic-string-reader))
 
 (define-public sbcl-slime-swank
-  (package
-    (name "sbcl-slime-swank")
-    (version "2.28")
-    (source
-     (origin
-       (file-name (git-file-name "cl-slime-swank" version))
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/slime/slime/")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll"))
-       (modules '((guix build utils)))
+  (let ((commit "1e4b7417a1ade842ba4938f66445af68a93176b9")
+        (revision "0"))
+    (package
+      (name "sbcl-slime-swank")
+      (version (git-version "2.28" revision commit))
+      (source
+       (origin
+         (file-name (git-file-name "cl-slime-swank" version))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/slime/slime/")
+               (commit commit)))
+         (sha256
+          (base32 "17fs4wjplcxwbgsqzawwnw45xw6rdyyqk3f7dqck7pfazpzziizp"))
+         (modules '((guix build utils)))
          (snippet
           ;; The doc folder drags `gawk' into the closure.  Doc is already
           ;; provided by emacs-slime.
           `(begin
              (delete-file-recursively "doc")
              #t))))
-    (build-system asdf-build-system/sbcl)
-    (arguments
-     '(#:asd-systems '("swank")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-fasl-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib-dir (string-append out "/lib/common-lisp/"
-                                            (%lisp-type)
-                                            "/slime-swank/")))
-               ;; Use the ASDF registry instead of Swank's default that places
-               ;; the .fasl files in ~/.slime.
-               (substitute* "swank.asd"
-                 (("\\(load \\(asdf::component-pathname f\\)\\)" all)
-                  (string-append
-                   all "\n"
-                   "(setf (symbol-value"
-                   "(read-from-string \"swank-loader::*fasl-directory*\"))"
-                   "\"" lib-dir "\")")))
-               (substitute* "swank-loader.lisp"
-                 (("\\(probe-file fasl\\)" all)
-                  ;; Do not try to delete Guix store files.
-                  (string-append
-                   all "\n"
-                   " (not (equal (subseq (pathname-directory fasl) 1 3)"
-                   " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))))
-    (home-page "https://github.com/slime/slime")
-    (synopsis "Common Lisp Swank server")
-    (description
-     "This is only useful if you want to start a Swank server in a Lisp
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       '(#:asd-systems '("swank" "swank/exts")
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'set-fasl-directory
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (lib-dir (string-append out "/lib/common-lisp/"
+                                              (%lisp-type)
+                                              "/slime-swank/")))
+                 ;; Use the ASDF registry instead of Swank's default that places
+                 ;; the .fasl files in ~/.slime.
+                 (substitute* "swank.asd"
+                   (("\\(load \\(asdf::component-pathname f\\)\\)" all)
+                    (string-append
+                     all "\n"
+                     "(setf (symbol-value"
+                     "(read-from-string \"swank-loader::*fasl-directory*\"))"
+                     "\"" lib-dir "\")")))
+                 (substitute* "swank-loader.lisp"
+                   (("\\(probe-file fasl\\)" all)
+                    ;; Do not try to delete Guix store files.
+                    (string-append
+                     all "\n"
+                     " (not (equal (subseq (pathname-directory fasl) 1 3)"
+                     " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))))
+      (home-page "https://github.com/slime/slime")
+      (synopsis "Common Lisp Swank server")
+      (description
+       "This is only useful if you want to start a Swank server in a Lisp
 processes that doesn't run under Emacs.  Lisp processes created by
 @command{M-x slime} automatically start the server.")
-    (license (list license:gpl2+ license:public-domain))))
+      (license (list license:gpl2+ license:public-domain)))))
 
 (define-public cl-slime-swank
   (let ((pkg (sbcl-package->cl-source-package sbcl-slime-swank)))
-- 
2.41.0

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[Christopher Baines]

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


André A. Gomes <andremegafone@gmail.com> writes:

> Hi Guix,
>
> Please find the patch attached.  Thanks!

It seems like you've attached two patches? It's useful to just send one
patch per email, as lots of tooling expects that.

Looking at the first patch though, packaging anything but the latest
release shouldn't be the norm [1].

1: https://guix.gnu.org/manual/en/guix.html#index-version-number_002c-for-VCS-snapshots

You need to put the reasoning for updating these packages to these
specific commits in to some comments. Depending on that justification as
well, we need to decide whether to ship these versions in addition to
the latest releases, or as you're doing currently to replace the latest
releases with these snapshots.

What approach to take depends on the justification, e.g. if the latest
release is unusable or using it could be problematic, then replacing it
with a snapshot seems better, otherwise, we should create package
variants (e.g. emacs-slime-next) for these snapshots.

Does that make sense?

Thanks,

Chris

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

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[André A. Gomes]

Christopher Baines <mail@cbaines.net> writes:

> It seems like you've attached two patches? It's useful to just send one
> patch per email, as lots of tooling expects that.

I'm more used to sending patches as email attachments, instead of using
git-send-email.  If Guix requires the latter then I'll adjust, but I've
been sending plenty of patches following the former approach.

> Looking at the first patch though, packaging anything but the latest
> release shouldn't be the norm [1].
>
> 1: https://guix.gnu.org/manual/en/guix.html#index-version-number_002c-for-VCS-snapshots
>
> You need to put the reasoning for updating these packages to these
> specific commits in to some comments. Depending on that justification as
> well, we need to decide whether to ship these versions in addition to
> the latest releases, or as you're doing currently to replace the latest
> releases with these snapshots.
>
> What approach to take depends on the justification, e.g. if the latest
> release is unusable or using it could be problematic, then replacing it
> with a snapshot seems better, otherwise, we should create package
> variants (e.g. emacs-slime-next) for these snapshots.

It makes no sense to have emacs-slime-next and cl-slime-swank-next.
I've bumped it because significant changes have been introduced since
the last tagged released.

In the meantime, I've kindly request a tagged release upstream.  Whether
I'll get a reply soon remains to be seen.

https://github.com/slime/slime/issues/792

With all respect to your work, Christopher Baines, I'd kindly suggest a
review by the Common Lisp team - Guillaume Le Vaillant, who has been
reviewing most of my patches lately.

Thanks!


-- 
André A. Gomes
"You cannot even find the ruins..."

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[André A. Gomes]

André A. Gomes <andremegafone@gmail.com> writes:

> It makes no sense to have emacs-slime-next and cl-slime-swank-next.
> I've bumped it because significant changes have been introduced since
> the last tagged released.
>
> In the meantime, I've kindly request a tagged release upstream.  Whether
> I'll get a reply soon remains to be seen.
>
> https://github.com/slime/slime/issues/792

Still no reply to my request to tag a new release.  These projects are
run by volunteers and releases are rare.

Recently Ludovic merged a similar patch in spirit (relative to SLY,
instead of Slime), see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66100.

I'd kindly ask to take another look at the patch.  I'm adding Ludo and
Guillaume in CC.  Thanks!

As a sidenote, I'm considering requesting commit access to Guix to help
the team that handles Common Lisp and WebKitGTK.  I am part of the Nyxt
team - https://github.com/atlas-engineer/nyxt.


-- 
André A. Gomes
"You cannot even find the ruins..."

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[André A. Gomes]

André A. Gomes <andremegafone@gmail.com> writes:

> André A. Gomes <andremegafone@gmail.com> writes:
>
>> It makes no sense to have emacs-slime-next and cl-slime-swank-next.
>> I've bumped it because significant changes have been introduced since
>> the last tagged released.
>>
>> In the meantime, I've kindly request a tagged release upstream.  Whether
>> I'll get a reply soon remains to be seen.
>>
>> https://github.com/slime/slime/issues/792

The author ignored my kind request release.

I still think that it is not necessary to maintain both emacs-slime-next
and emacs-slime, but please help me to get this patch through.  Thanks.


-- 
André A. Gomes
"You cannot even find the ruins..."

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[Guillaume Le Vaillant]

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

Hi.
Concerning patch 2 for sbcl-slime-swank, the first 'substitute*' form
of the 'set-fasl-directory' phase looks obsolete because of changes in
"swank.asd".
If the fasl files are now put in the right place even without it, and if
slime and swank still work fine, could you send an updated patch?
Thanks.

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

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[André A. Gomes]

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

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

> Hi.
> Concerning patch 2 for sbcl-slime-swank, the first 'substitute*' form
> of the 'set-fasl-directory' phase looks obsolete because of changes in
> "swank.asd".
> If the fasl files are now put in the right place even without it, and if
> slime and swank still work fine, could you send an updated patch?
> Thanks.

Hi Guillaume,

Thanks for pointing that out.  Please find the updated patches attached.


-- 
André A. Gomes
"You cannot even find the ruins..."

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-slime-Update-to-2.28-0.0cc2e73.patch --]
[-- Type: text/x-patch, Size: 1868 bytes --]

From 7a9559602c62c90d9d4ff01233bce2c33b2d34d3 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 24 Oct 2023 10:28:01 +0300
Subject: [PATCH 1/2] gnu: emacs-slime: Update to 2.28-0.0cc2e73.

* gnu/packages/emacs-xyz.scm (emacs-slime): Update to 2.28-0.0cc2e73.
---
 gnu/packages/emacs-xyz.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7112a65181..ed31b0fd19 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9895,18 +9895,21 @@ (define-public emacs-tagedit
     (license license:gpl3+)))
 
 (define-public emacs-slime
-  (package
+  ;; Update together with sbcl-slime-swank.
+  (let ((commit "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad")
+        (revision "0"))
+    (package
     (name "emacs-slime")
-    (version "2.28")
+    (version (git-version "2.28" revision commit))
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/slime/slime")
-             (commit (string-append "v" version))))
+             (commit commit)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll"))))
+        (base32 "0iq9r4007rrnabj290y79i926x2m4j20j6b0x701pkywz926sn02"))))
     (build-system emacs-build-system)
     (arguments
      (list
@@ -9956,7 +9959,7 @@ (define-public emacs-slime
 While lisp-mode supports editing Lisp source files, @command{slime-mode}
 adds support for interacting with a running Common Lisp process
 for compilation, debugging, documentation lookup, and so on.")
-    (license (list license:gpl2+ license:public-domain))))
+    (license (list license:gpl2+ license:public-domain)))))
 
 (define-public emacs-popup
   (package
-- 
2.41.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-sbcl-slime-swank-Update-to-2.28-0.0cc2e73.patch --]
[-- Type: text/x-patch, Size: 5288 bytes --]

From ef9e74ddf74fb336748529ce6bcc508ef245712c Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 24 Oct 2023 10:28:43 +0300
Subject: [PATCH 2/2] gnu: sbcl-slime-swank: Update to 2.28-0.0cc2e73.

* gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.28-0.0cc2e73.
---
 gnu/packages/lisp-xyz.scm | 83 ++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index e7b603f59d..692142e4a8 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -3610,76 +3610,51 @@ (define-public ecl-pythonic-string-reader
   (sbcl-package->ecl-package sbcl-pythonic-string-reader))
 
 (define-public sbcl-slime-swank
-  (package
-    (name "sbcl-slime-swank")
-    (version "2.28")
-    (source
-     (origin
-       (file-name (git-file-name "cl-slime-swank" version))
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/slime/slime/")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll"))
-       (modules '((guix build utils)))
+  (let ((commit "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad")
+        (revision "0"))
+    (package
+      (name "sbcl-slime-swank")
+      (version (git-version "2.28" revision commit))
+      (source
+       (origin
+         (file-name (git-file-name "cl-slime-swank" version))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/slime/slime/")
+               (commit commit)))
+         (sha256
+          (base32 "0iq9r4007rrnabj290y79i926x2m4j20j6b0x701pkywz926sn02"))
+         (modules '((guix build utils)))
          (snippet
           ;; The doc folder drags `gawk' into the closure.  Doc is already
           ;; provided by emacs-slime.
           `(begin
              (delete-file-recursively "doc")
              #t))))
-    (build-system asdf-build-system/sbcl)
-    (arguments
-     '(#:asd-systems '("swank")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'set-fasl-directory
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib-dir (string-append out "/lib/common-lisp/"
-                                            (%lisp-type)
-                                            "/slime-swank/")))
-               ;; Use the ASDF registry instead of Swank's default that places
-               ;; the .fasl files in ~/.slime.
-               (substitute* "swank.asd"
-                 (("\\(load \\(asdf::component-pathname f\\)\\)" all)
-                  (string-append
-                   all "\n"
-                   "(setf (symbol-value"
-                   "(read-from-string \"swank-loader::*fasl-directory*\"))"
-                   "\"" lib-dir "\")")))
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       '(#:asd-systems '("swank" "swank/exts")
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'set-fasl-directory
+             (lambda* (#:key outputs #:allow-other-keys)
                (substitute* "swank-loader.lisp"
                  (("\\(probe-file fasl\\)" all)
                   ;; Do not try to delete Guix store files.
                   (string-append
                    all "\n"
                    " (not (equal (subseq (pathname-directory fasl) 1 3)"
-                   " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))))
-    (home-page "https://github.com/slime/slime")
-    (synopsis "Common Lisp Swank server")
-    (description
-     "This is only useful if you want to start a Swank server in a Lisp
+                   " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH"))))))))
+      (home-page "https://github.com/slime/slime")
+      (synopsis "Common Lisp Swank server")
+      (description
+       "This is only useful if you want to start a Swank server in a Lisp
 processes that doesn't run under Emacs.  Lisp processes created by
 @command{M-x slime} automatically start the server.")
-    (license (list license:gpl2+ license:public-domain))))
+      (license (list license:gpl2+ license:public-domain)))))
 
 (define-public cl-slime-swank
-  (let ((pkg (sbcl-package->cl-source-package sbcl-slime-swank)))
-    (package
-      (inherit pkg)
-      (arguments
-       (substitute-keyword-arguments (package-arguments pkg)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'install 'revert-asd-patch
-               ;; We do not want to include the Guix patch in the cl- package
-               ;; since it would include the sbcl- package in the closure.
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (let* ((out (assoc-ref outputs "out"))
-                        (source-path (string-append out "/share/common-lisp/source/")))
-                   (substitute* (string-append source-path "/cl-slime-swank/swank.asd")
-                     ((".*fasl-directory.*") ""))))))))))))
+  (sbcl-package->cl-source-package sbcl-slime-swank))
 
 (define-public ecl-slime-swank
   (sbcl-package->ecl-package sbcl-slime-swank))
-- 
2.41.0

bug#66143: [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[Guillaume Le Vaillant]

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

Patches applied as d62a613bcff726dfc835313064228e7bc3b7cda6 and
following, with a completed commit message for the second patch.
Thanks.

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

[bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741

[Christopher Baines]

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


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

> Patches applied as d62a613bcff726dfc835313064228e7bc3b7cda6 and
> following, with a completed commit message for the second patch.

I did raise an objection earlier in the thread to these changes being
merged. Not discussing (or even acknowledging issues raised) is
unhelpful.

Given what I've now read from upstream [1], I think it can be justified
in this case, but this is independent from the above. I think we still
should record reasons for deviating from the norm in comments (and
commit messages if useful).

1: https://github.com/slime/slime/issues/792

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