From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uHWHLBpDb2DhZAEAgWs5BA (envelope-from ) for ; Thu, 08 Apr 2021 19:53:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id iMJhJhpDb2AYCwAAbx9fmQ (envelope-from ) for ; Thu, 08 Apr 2021 17:53:30 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4DB6D1BBEC for ; Thu, 8 Apr 2021 19:53:30 +0200 (CEST) Received: from localhost ([::1]:38374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYqP-0006zN-Dz for larch@yhetil.org; Thu, 08 Apr 2021 13:53:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYp3-0005tU-LR for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYp3-0004yg-Aj for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYp3-0003qe-9s for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 24/33] gnu: Add emacs-geiser-guile. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:52:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161790428914577 (code B ref 47661); Thu, 08 Apr 2021 17:52:05 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:29 +0000 Received: from localhost ([127.0.0.1]:48248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoS-0003mr-OY for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:29 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoK-0003m8-DY for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:21 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMn4M6pz1LWpZ; Thu, 8 Apr 2021 19:51:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMn4M6pz1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904277; bh=I+5QoBEKmP1DvwvgFWake5mhPnvc8vy6fbWyCMDzSQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e2vlnxD8ezgQJETiW4tmhwlpE1i258vaaxWffP6NZLeJVjHwkZ7SWGnz1YQpuRYny QWYd5xb2MMfIgRwmRCY7J6NmmhZScufATEDKBiLbrx/lAXbxwUXpfPw00oVjJHOaY7 6T/1zCbZDnSmR1dCMTQoHVhnfk2Dhchkd5EdwIWg= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:58 +0200 Message-Id: <20210408175007.13360-24-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617904410; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=I+5QoBEKmP1DvwvgFWake5mhPnvc8vy6fbWyCMDzSQw=; b=Vrsmo2N3e+Gr84T5riQG6d6cj5R2AEbVGgQkXPl8QtnGda1NOKpg56C0PDoyzAKPLlA45b 6Hhrl2TORblWsikEhZOt3VIfK/cjui+j7mmaYxhqEfkOgDUCGLBhNb8Ubwhxw9fHvrm2oY 66M921eFuS6hQd0ShRy1cCPOqKHSitGNKG+o35WXsqq8/uSHpgBwVcfcKTGJfxta485DOG FOKGXS9xSlPPbdAVG6t1LYAVCGMBJ4h+b91zxZrYKmNRJi/jf4OtWnlZiOvMY5qTATM79D rWBja67tGpXVQvvd01x57t2frCCS2q9KP4BB2WCJ6XHpv2cKfdQVwU3ibBlu0g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617904410; a=rsa-sha256; cv=none; b=js01fqup8tOK5/4etXlc6q2RgmCvSWwvM03fsGQBnvNE4jejYQcZgISsUCIwullfYYveIK LVWtpT/OW3LqnH2ptDVtWGfUZpxOO5z3zkGlNOkteVK4mOvKrugTsEqh+ShotdQ55PyDCy ADj6uX+8IdteM0MQomFt9zxUo3j02xAca7JmYKR629HpnOwJPIsO+9Dsf+/0S7A2glk1Mf vG9n1RunVR2oi9lWB+Dxe0CD4H7cn39NP9WMsqR9TwHH3jHXNJitXgsK9mGVf2DFw+IhCN GxJLq0Nrx23eAtjRRHtOIRwPsr4CRsvBqzZRTv3eS6Rp3WnsONUc6uIINfSe0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=e2vlnxD8; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=e2vlnxD8; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4DB6D1BBEC X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: ziJX/ocS6IS1 From: Morgan Smith * 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 --- 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 +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