Subject: bug#66143: closed (Re: [bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 24 Oct 2023 12:43:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
66143: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66143
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741
From: Guillaume Le Vaillant <[email-masked]>
To: André A. Gomes <[email-masked]>
Cc: [email-masked], Christopher Baines <[email-masked]>, [email-masked]
Date: Tue, 24 Oct 2023 12:40:39 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

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

Subject: [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741
From: André A. Gomes <[email-masked]>
To: [email-masked]
Date: Thu, 21 Sep 2023 23:51:17 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Guix,

Please find the patch attached.  Thanks!

-- 
André A. Gomes
"You cannot even find the ruins..."
>From 2a5b2b845c0a9446d22803bf90d46741b78cee5b Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <[email-masked]>
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

>From 00613aca02a1c84e773a723d42bb57351c1fec33 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <[email-masked]>
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