From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cjvyEasfe2DZQQEAgWs5BA (envelope-from ) for ; Sat, 17 Apr 2021 19:49:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qAFLC6sfe2DJcgAAbx9fmQ (envelope-from ) for ; Sat, 17 Apr 2021 17:49:31 +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 A8F40CE99 for ; Sat, 17 Apr 2021 19:49:30 +0200 (CEST) Received: from localhost ([::1]:32966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoUS-0003br-JO for larch@yhetil.org; Sat, 17 Apr 2021 13:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQZ-0008Mz-39 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQY-0000KC-Ps for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQY-0005eh-Kg for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 23/33] gnu: emacs-geiser: Update to 0.13. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:14 +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.161867928421525 (code B ref 47661); Sat, 17 Apr 2021 17:08:14 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:04 +0000 Received: from localhost ([127.0.0.1]:44353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQJ-0005a2-Dj for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:2207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQC-0005ZH-Aw for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:53 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzT4T5jz1LBRx; Sat, 17 Apr 2021 19:07:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzT4T5jz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679269; bh=PYi0BuEQ6UQRsIzo0KIE2kGpWbave/ZsrkryueoOb2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RvcDkTA3p2tUoXGEX1G0lVI4LeGZkHfvZ3uMumSarGNJN1T0xxeiI7tTs9dSslKGi 44PJde82A4OeL44y5jh4CkmBMVeCzJdbiOWicFe85uEdAdOjDlDP7yefflzBY9rawi xCY4BGU7p6bcZumUH/+Ta/jnW1lIzamj98YOraPI= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:38 +0200 Message-Id: <20210417170648.3810-23-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-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=1618681770; 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=PYi0BuEQ6UQRsIzo0KIE2kGpWbave/ZsrkryueoOb2E=; b=ubWcuAYVbCsklKM+1Y1ukfiUigMacv/TuiVBduEElkgD5tuTLopp9prek6fVfDSBlLKBlX HKq4UfnRyaebGkUrmVnFi7K4fMmnzPgus6IU1DALLS8Khuc8m2PfNiY+VADEIetve95GdY Vc396TbM5S8dx0T8x0Wb6HJbCiPpVKWaSqt7A78wAR6vwPE1iud35vJNT5GLZ2zuulf69e 35+JGH3fdNL0/MQSePe4ehdrRoNaCLxeFUhjP1I5eKxy45dlwqaorexaW/en+KJN9EKhn6 ZoAMYw8TgwUd1WJKpR+CDKh35g0oDhR0hjsxpR40EnyU9t3jC7wbHrH4uzCvSQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618681770; a=rsa-sha256; cv=none; b=spD9vzjFI2ArnHYNMX5BcfmftDNbph4w+16HnGMfZuQSQz1pvB+gOmtdfsYqmLij1cbW8p nNPEYE9sI+8ibt6YwbKvz5nuqBE08tb/Zvhdxr9bChN8RY2HwrWYHQ0csMEZl6KKUg8EKB f9dT0apTtClEbzG/uQcr8yCKU8Kx3kcKJMtXFcFE/ozz9tFDFeSeIbnvpHH/K0CO3PlHDQ cuRY5qraJIT8tmOUthhUNVN7Xm16zn3H0MGxHZ8biojAX4UlaSGAxlPmI1GtBlpsdcOyTR /UduIn7a6UxoqunTZCJgAxC9hCyDDVDpGTh885TQn2jk3cAjWJMtJ90kLyIOwA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=RvcDkTA3; 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-Spam-Score: 5.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=RvcDkTA3; 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: A8F40CE99 X-Spam-Score: 5.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: PNexQcTIMINs From: Morgan Smith * gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it here. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.13. [source]: Change upstream URL. [build-system]: Change to emacs-build-system. [arguments]: Adjust accordingly. [native-inputs]: Remove emacs, autoconf, and automake. [description]: State that other packages are needed for geiser to be useful. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 46 +++++++++++-------- ...ser-autoload-activate-implementation.patch | 26 +++++++++++ 3 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 50b11a8ca2..393fa61bf5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -968,6 +968,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-autoload-activate-implementation.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0dc7b8961b..85295524a5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -219,43 +219,51 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/jaor/geiser/") + (url "https://gitlab.com/emacs-geiser/geiser.git") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08")))) - (build-system gnu-build-system) + (base32 "0bwjcfmcyv6z0i5ivqirgcibxdkrlf5vyxcbj7k8dk7flwg1fpd9")) + (patches + (search-patches "emacs-geiser-autoload-activate-implementation.patch")))) + (build-system emacs-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (symlink "geiser-install.el" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/" - "geiser-autoloads.el")) - #t))))) - (inputs - `(("guile" ,guile-2.2))) + ;; Move the source files to the top level, which is included in + ;; the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./elisp" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)) + #t)) + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "doc" + (invoke "makeinfo" "--no-split" + "-o" "geiser.info" "geiser.texi"))))))) (native-inputs - `(("emacs" ,emacs-minimal) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) + `(("texinfo" ,texinfo))) (home-page "https://nongnu.org/geiser/") - (synopsis "Collection of Emacs modes for Guile and Racket hacking") + (synopsis "Collection of Emacs modes for Scheme hacking") (description "Geiser is a collection of Emacs major and minor modes that conspire with one or more Scheme implementations to keep the Lisp Machine Spirit alive. The continuously running Scheme interpreter takes the center of the stage in Geiser. A bundle of Elisp shims orchestrates the dialog between the Scheme implementation, Emacs and, ultimately, the schemer, giving them access to live -metadata.") +metadata. + +This package provides just the core of Geiser. To effectively use it with your +favourite Scheme implementation, you also need the corresponding geiser package, +e.g. emacs-geiser-guile for Guile.") (license license:bsd-3))) (define-public emacs-ac-geiser diff --git a/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch b/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch new file mode 100644 index 0000000000..47d513b3a3 --- /dev/null +++ b/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch @@ -0,0 +1,26 @@ +From 9fd3174cead8bfa17a8413bffa38362853d71a02 Mon Sep 17 00:00:00 2001 +From: jao +Date: Mon, 5 Apr 2021 23:06:56 +0100 +Subject: [PATCH] autoload geiser activate implementation + +--- + elisp/geiser.el | 3 +++ + readme.org | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/elisp/geiser.el b/elisp/geiser.el +index 887b8da..96c1dd6 100644 +--- a/elisp/geiser.el ++++ b/elisp/geiser.el +@@ -104,6 +104,9 @@ + ;;;###autoload + (autoload 'geiser-mode--maybe-activate "geiser-mode") + ++;;;###autoload ++(autoload 'geiser-activate-implementation "geiser-impl") ++ + ;;;###autoload + (mapc (lambda (group) + (custom-add-load group (symbol-name group)) +-- +GitLab -- 2.31.1