[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47661] [PATCH 24/33] gnu: Add emacs-geiser-guile.
From: |
Leo Prikler |
Subject: |
[bug#47661] [PATCH 24/33] gnu: Add emacs-geiser-guile. |
Date: |
Thu, 8 Apr 2021 19:49:58 +0200 |
From: Morgan Smith <Morgan.J.Smith@outlook.com>
* gnu/packages/patches/emacs-geiser-guile-auto-activate.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it here.
* gnu/packages/emacs-xyz.scm (emacs-geiser-guile): New variable.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
---
gnu/local.mk | 1 +
gnu/packages/emacs-xyz.scm | 42 +++++++++++++++++++
.../emacs-geiser-guile-auto-activate.patch | 34 +++++++++++++++
3 files changed, 77 insertions(+)
create mode 100644 gnu/packages/patches/emacs-geiser-guile-auto-activate.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index c4eb1ab1f5..2175e542d9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -967,6 +967,7 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
+ %D%/packages/patches/emacs-geiser-guile-auto-activate.patch \
%D%/packages/patches/emacs-geiser-autoload-activate-implementation.patch
\
%D%/packages/patches/emacs-ignore-empty-xim-styles.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 74f82293fc..dc1b1e0c7e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -264,6 +264,48 @@ favourite Scheme implementation, you also need the
corresponding geiser package,
e.g. emacs-geiser-guile for Guile.")
(license license:bsd-3)))
+(define-public emacs-geiser-guile
+ (package
+ (name "emacs-geiser-guile")
+ (version "0.13")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/emacs-geiser/guile.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0w264pjwlxna31260ll6gd0n77jlynhzf3h2dws5wr7jflns5mbc"))
+ (patches (search-patches
+ "emacs-geiser-guile-auto-activate.patch"))))
+ (build-system emacs-build-system)
+ (arguments
+ '(#:include (cons "^src/" %default-include)
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'make-autoloads 'patch-autoloads
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* (string-append
+ (elpa-directory (assoc-ref outputs "out"))
+ "/geiser-guile-autoloads.el")
+ ;; Activating implementations fails when Geiser is not yet
+ ;; loaded, so let's defer that until it is.
+ (("\\(geiser-activate-implementation .*\\)" all)
+ (string-append
+ "(eval-after-load 'geiser-impl '" all ")")))
+ #t)))))
+ (inputs
+ `(("guile" ,guile-2.2)))
+ (propagated-inputs
+ `(("geiser" ,emacs-geiser)))
+ (home-page "https://nongnu.org/geiser/")
+ (synopsis "Guile Scheme support for Geiser")
+ (description
+ "This package adds support for the Guile Scheme implementation to Geiser,
+a generic Scheme interaction mode for the GNU Emacs editor.")
+ (license license:bsd-3)))
+
(define-public emacs-ac-geiser
(let ((commit "93818c936ee7e2f1ba1b315578bde363a7d43d05")
(revision "0"))
diff --git a/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch
b/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch
new file mode 100644
index 0000000000..44837f90df
--- /dev/null
+++ b/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch
@@ -0,0 +1,34 @@
+From 93ef7101fdfcc7eac6f465b4b9788c384a323c14 Mon Sep 17 00:00:00 2001
+From: jao <jao@gnu.org>
+Date: Mon, 5 Apr 2021 20:17:50 +0100
+Subject: [PATCH] fix: auto-activate guile implementation
+
+---
+ geiser-guile.el | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/geiser-guile.el b/geiser-guile.el
+index 340442b..deeb76f 100644
+--- a/geiser-guile.el
++++ b/geiser-guile.el
+@@ -25,6 +25,7 @@
+ (require 'geiser-syntax)
+ (require 'geiser-custom)
+ (require 'geiser-repl)
++(require 'geiser-impl)
+ (require 'geiser-base)
+ (require 'geiser-eval)
+ (require 'geiser-edit)
+@@ -474,6 +475,9 @@ it spawn a server thread."
+
+ (geiser-impl--add-to-alist 'regexp "\\.scm$" 'guile t)
+
++;;;###autoload
++(geiser-activate-implementation 'guile)
++
+ ;;;###autoload
+ (autoload 'run-guile "geiser-guile" "Start a Geiser Guile REPL." t)
+
+--
+GitLab
+
--
2.31.1
- [bug#47661] [PATCH 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system., (continued)
- [bug#47661] [PATCH 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 13/33] gnu: emacs-shroud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 05/33] gnu: emacs-libgit: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 12/33] gnu: emacs-pdf-tools: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 15/33] gnu: emacs-sly-stepper: Remove generated sources., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 18/33] gnu: emacs-scel: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 20/33] gnu: notmuch: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 23/33] gnu: emacs-geiser: Update to 0.13., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 24/33] gnu: Add emacs-geiser-guile.,
Leo Prikler <=
- [bug#47661] [PATCH 25/33] gnu: emacs-guix: Update to 0.5.2-4.8ce6d21., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 21/33] gnu: emacs-pyim: Update to 3.6., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 32/33] gnu: emacs-haskell-mode: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 29/33] gnu: emacs-dvc: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 33/33] gnu: emacs-julia-snail: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 27/33] gnu: guile-studio: Add missing input., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 26/33] gnu: emacs-flycheck-guile: Add missing input., Leo Prikler, 2021/04/08
- [bug#47661] [PATCH 31/33] gnu: emacs-wget: Port to emacs-build-system., Leo Prikler, 2021/04/08