* [bug#69869] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.29.1
@ 2024-03-18 8:49 André A. Gomes
2024-03-20 12:28 ` bug#69869: " Guillaume Le Vaillant
0 siblings, 1 reply; 2+ messages in thread
From: André A. Gomes @ 2024-03-18 8:49 UTC (permalink / raw)
To: 69869
[-- Attachment #1: Type: text/plain, Size: 82 bytes --]
Attached, thanks.
--
André A. Gomes
"You cannot even find the ruins..."
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-sbcl-slime-swank-Update-to-2.29.1.patch --]
[-- Type: text/x-patch, Size: 4216 bytes --]
From be6ff84dce151bc2ae80547aeb32df1bc19f1a9d Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Mon, 18 Mar 2024 10:47:56 +0200
Subject: [PATCH 2/2] gnu: sbcl-slime-swank: Update to 2.29.1.
* gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.29.1.
---
gnu/packages/lisp-xyz.scm | 79 +++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index ec9bf3a9ca..012a62526f 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -3687,48 +3687,47 @@ (define-public ecl-pythonic-string-reader
(sbcl-package->ecl-package sbcl-pythonic-string-reader))
(define-public sbcl-slime-swank
- (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d")
- (revision "1"))
- (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 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7"))
- (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" "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
+ ;; Update together with emacs-slime.
+ (package
+ (name "sbcl-slime-swank")
+ (version "2.29.1")
+ (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 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki"))
+ (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" "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
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
(sbcl-package->cl-source-package sbcl-slime-swank))
--
2.41.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-emacs-slime-Update-to-2.29.1.patch --]
[-- Type: text/x-patch, Size: 6433 bytes --]
From 267dedcf4f94cfcdc1feeb0b79c87b3dd51415fb Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Mon, 18 Mar 2024 10:47:48 +0200
Subject: [PATCH 1/2] gnu: emacs-slime: Update to 2.29.1.
* gnu/packages/emacs-xyz.scm (emacs-slime): Update to 2.29.1.
---
gnu/packages/emacs-xyz.scm | 117 ++++++++++++++++++-------------------
1 file changed, 58 insertions(+), 59 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 66ac39b701..e691aa8658 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10356,70 +10356,68 @@ (define-public emacs-tagedit
(define-public emacs-slime
;; Update together with sbcl-slime-swank.
- (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d")
- (revision "1"))
- (package
- (name "emacs-slime")
- (version (git-version "2.28" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/slime/slime")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:include #~(cons* "\\.lisp$" "\\.asd$"
- "contrib"
- "lib/hyperspec.el"
- %default-include)
- #:exclude #~(list "^slime-tests.el" "^contrib/test/"
- "^contrib/Makefile$" "^contrib/README.md$")
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'install 'configure
- (lambda* _
- (emacs-substitute-variables "slime.el"
- ("inferior-lisp-program" "sbcl"))))
- (add-before 'install 'install-doc
- (lambda _
- (let ((info-dir (string-append #$output "/share/info"))
- (doc-dir (string-append #$output "/share/doc/"
- #$name "-" #$version))
- (doc-files '("doc/slime-refcard.pdf"
- "README.md" "NEWS" "PROBLEMS"
- "CONTRIBUTING.md")))
- (with-directory-excursion "doc"
- (substitute* "Makefile"
- (("infodir=/usr/local/info")
- (string-append "infodir=" info-dir)))
- (invoke "make" "html/index.html")
- (invoke "make" "slime.info")
- (install-file "slime.info" info-dir)
- (copy-recursively "html" (string-append doc-dir "/html")))
- (for-each (lambda (f)
- (install-file f doc-dir)
- (delete-file f))
- doc-files)
- (delete-file-recursively "doc")))))))
- (propagated-inputs
- (list emacs-macrostep))
- (native-inputs
- (list texinfo))
- (home-page "https://github.com/slime/slime")
- (synopsis "Superior Lisp Interaction Mode for Emacs")
- (description
- "SLIME extends Emacs with support for interactive programming in
+ (package
+ (name "emacs-slime")
+ (version "2.29.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/slime/slime")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:include #~(cons* "\\.lisp$" "\\.asd$"
+ "contrib"
+ "lib/hyperspec.el"
+ %default-include)
+ #:exclude #~(list "^slime-tests.el" "^contrib/test/"
+ "^contrib/Makefile$" "^contrib/README.md$")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'configure
+ (lambda* _
+ (emacs-substitute-variables "slime.el"
+ ("inferior-lisp-program" "sbcl"))))
+ (add-before 'install 'install-doc
+ (lambda _
+ (let ((info-dir (string-append #$output "/share/info"))
+ (doc-dir (string-append #$output "/share/doc/"
+ #$name "-" #$version))
+ (doc-files '("doc/slime-refcard.pdf"
+ "README.md" "NEWS" "PROBLEMS"
+ "CONTRIBUTING.md")))
+ (with-directory-excursion "doc"
+ (substitute* "Makefile"
+ (("infodir=/usr/local/info")
+ (string-append "infodir=" info-dir)))
+ (invoke "make" "html/index.html")
+ (invoke "make" "slime.info")
+ (install-file "slime.info" info-dir)
+ (copy-recursively "html" (string-append doc-dir "/html")))
+ (for-each (lambda (f)
+ (install-file f doc-dir)
+ (delete-file f))
+ doc-files)
+ (delete-file-recursively "doc")))))))
+ (propagated-inputs
+ (list emacs-macrostep))
+ (native-inputs
+ (list texinfo))
+ (home-page "https://github.com/slime/slime")
+ (synopsis "Superior Lisp Interaction Mode for Emacs")
+ (description
+ "SLIME extends Emacs with support for interactive programming in
Common Lisp. The features are centered around @command{slime-mode},
an Emacs minor mode that complements the standard @command{lisp-mode}.
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
@@ -39658,3 +39656,4 @@ (define-public emacs-back-button
;;; of a merge conflict, place them above by existing packages with similar
;;; functionality or similar names.
;;;
+emacs-slime
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#69869: [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.29.1
2024-03-18 8:49 [bug#69869] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.29.1 André A. Gomes
@ 2024-03-20 12:28 ` Guillaume Le Vaillant
0 siblings, 0 replies; 2+ messages in thread
From: Guillaume Le Vaillant @ 2024-03-20 12:28 UTC (permalink / raw)
To: André A. Gomes; +Cc: 69869-done
[-- Attachment #1: Type: text/plain, Size: 83 bytes --]
Patches applied as fa3633134464f17eeca61205382187796cbcdcca and
following.
Thanks.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-20 13:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-18 8:49 [bug#69869] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.29.1 André A. Gomes
2024-03-20 12:28 ` bug#69869: " Guillaume Le Vaillant
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).