From patchwork Mon May 24 21:38:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Dashyan X-Patchwork-Id: 29577 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0DE3827BC78; Mon, 24 May 2021 22:40:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 19BB927BC83 for ; Mon, 24 May 2021 22:40:16 +0100 (BST) Received: from localhost ([::1]:46914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llIJ5-0003ep-8R for patchwork@mira.cbaines.net; Mon, 24 May 2021 17:40:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llIIs-0003eQ-L6 for guix-patches@gnu.org; Mon, 24 May 2021 17:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llIIs-00084g-De for guix-patches@gnu.org; Mon, 24 May 2021 17:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llIIs-0001F1-BP for guix-patches@gnu.org; Mon, 24 May 2021 17:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48635] [PATCH 1/3] gnu: emacs-geiser: Update to 0.16. References: <20210524213150.1158-1-mail@davie.li> In-Reply-To: <20210524213150.1158-1-mail@davie.li> Resent-From: David Dashyan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48635@debbugs.gnu.org Cc: David Dashyan Received: via spool by 48635-submit@debbugs.gnu.org id=B48635.16218923584702 (code B ref 48635); Mon, 24 May 2021 21:40:02 +0000 Received: (at 48635) by debbugs.gnu.org; 24 May 2021 21:39:18 +0000 Received: from localhost ([127.0.0.1]:44065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llII5-0001Dh-K5 for submit@debbugs.gnu.org; Mon, 24 May 2021 17:39:18 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:34823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llII4-0001DU-27 for 48635@debbugs.gnu.org; Mon, 24 May 2021 17:39:13 -0400 Received: (Authenticated sender: mail@davie.li) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id BD6A620004; Mon, 24 May 2021 21:39:04 +0000 (UTC) From: David Dashyan Date: Tue, 25 May 2021 00:38:57 +0300 Message-Id: <20210524213857.1683-1-mail@davie.li> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 7 +++-- ...ser-autoload-activate-implementation.patch | 26 ------------------- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9dac7ea152..d772128518 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,7 +973,6 @@ dist_patch_DATA = \ %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 \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cc843bfb78..46e28e6cbe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -98,6 +98,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Eugene Klimov ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 David Dashyan ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,7 +222,7 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.13") + (version "0.16") (source (origin (method git-fetch) @@ -230,9 +231,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0bwjcfmcyv6z0i5ivqirgcibxdkrlf5vyxcbj7k8dk7flwg1fpd9")) - (patches - (search-patches "emacs-geiser-autoload-activate-implementation.patch")))) + (base32 "18gx7ak2ldpmqbimnq221dn2qg7qwm5n1mj6ajymwkgvqwcrsl2r")))) (build-system emacs-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch b/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch deleted file mode 100644 index 47d513b3a3..0000000000 --- a/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 From patchwork Mon May 24 21:39:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Dashyan X-Patchwork-Id: 29576 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CFBE127BC78; Mon, 24 May 2021 22:40:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A35527BC84 for ; Mon, 24 May 2021 22:40:17 +0100 (BST) Received: from localhost ([::1]:46938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llIJ6-0003hR-Cz for patchwork@mira.cbaines.net; Mon, 24 May 2021 17:40:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llIIu-0003eZ-BU for guix-patches@gnu.org; Mon, 24 May 2021 17:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llIIs-00085R-Ql for guix-patches@gnu.org; Mon, 24 May 2021 17:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llIIs-0001F8-Ob for guix-patches@gnu.org; Mon, 24 May 2021 17:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48635] [PATCH 2/3] gnu: Add emacs-geiser-racket. References: <20210524213150.1158-1-mail@davie.li> In-Reply-To: <20210524213150.1158-1-mail@davie.li> Resent-From: David Dashyan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48635@debbugs.gnu.org Cc: David Dashyan Received: via spool by 48635-submit@debbugs.gnu.org id=B48635.16218923944752 (code B ref 48635); Mon, 24 May 2021 21:40:02 +0000 Received: (at 48635) by debbugs.gnu.org; 24 May 2021 21:39:54 +0000 Received: from localhost ([127.0.0.1]:44068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llIIk-0001Ea-4U for submit@debbugs.gnu.org; Mon, 24 May 2021 17:39:54 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:34623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llIIh-0001EL-U4 for 48635@debbugs.gnu.org; Mon, 24 May 2021 17:39:52 -0400 Received: (Authenticated sender: mail@davie.li) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id A7EC960006; Mon, 24 May 2021 21:39:43 +0000 (UTC) From: David Dashyan Date: Tue, 25 May 2021 00:39:32 +0300 Message-Id: <20210524213932.1848-1-mail@davie.li> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/emacs-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 46e28e6cbe..089d57f5f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -187,6 +187,7 @@ #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) + #:use-module (gnu packages racket) #:use-module (gnu packages ruby) #:use-module (gnu packages rust-apps) #:use-module (gnu packages scheme) @@ -360,6 +361,49 @@ using geiser.") a generic Scheme interaction mode for the GNU Emacs editor.") (license license:expat))) +(define-public emacs-geiser-racket + (package + (name "emacs-geiser-racket") + (version "0.16") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/emacs-geiser/racket.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx")))) + (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-racket-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 ")")) + (("\\(geiser-implementation-extension .*\\)" all) + (string-append + "(eval-after-load 'geiser-impl '" all ")"))) + #t))))) + (inputs + `(("racket" ,racket))) + (propagated-inputs + `(("geiser" ,emacs-geiser))) + (home-page "https://nongnu.org/geiser/") + (synopsis "Racket support for Geiser") + (description + "This package adds support for the Racket implementation to Geiser, +a generic Scheme interaction mode for the GNU Emacs editor.") + (license license:bsd-3))) + (define-public emacs-vc-hgcmd (package (name "emacs-vc-hgcmd") From patchwork Mon May 24 21:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Dashyan X-Patchwork-Id: 29578 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B73F327BC81; Mon, 24 May 2021 22:41:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F4AC27BC78 for ; Mon, 24 May 2021 22:41:19 +0100 (BST) Received: from localhost ([::1]:47628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llIK6-0004B8-P4 for patchwork@mira.cbaines.net; Mon, 24 May 2021 17:41:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llIJq-0004B0-7m for guix-patches@gnu.org; Mon, 24 May 2021 17:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llIJp-0000Pb-Tr for guix-patches@gnu.org; Mon, 24 May 2021 17:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llIJp-0001Gv-S7 for guix-patches@gnu.org; Mon, 24 May 2021 17:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48635] [PATCH 3/3] gnu: emacs-geiser-guile: Update to 0.17. References: <20210524213150.1158-1-mail@davie.li> In-Reply-To: <20210524213150.1158-1-mail@davie.li> Resent-From: David Dashyan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 21:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48635 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48635@debbugs.gnu.org Cc: David Dashyan Received: via spool by 48635-submit@debbugs.gnu.org id=B48635.16218924564871 (code B ref 48635); Mon, 24 May 2021 21:41:01 +0000 Received: (at 48635) by debbugs.gnu.org; 24 May 2021 21:40:56 +0000 Received: from localhost ([127.0.0.1]:44073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llIJk-0001GV-Fw for submit@debbugs.gnu.org; Mon, 24 May 2021 17:40:56 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:43577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llIJh-0001GG-US for 48635@debbugs.gnu.org; Mon, 24 May 2021 17:40:55 -0400 Received: (Authenticated sender: mail@davie.li) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id BCD8660005; Mon, 24 May 2021 21:40:46 +0000 (UTC) From: David Dashyan Date: Tue, 25 May 2021 00:40:38 +0300 Message-Id: <20210524214038.2172-1-mail@davie.li> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 6 ++-- .../emacs-geiser-guile-auto-activate.patch | 34 ------------------- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/emacs-geiser-guile-auto-activate.patch diff --git a/gnu/local.mk b/gnu/local.mk index d772128518..b0df9d582d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -972,7 +972,6 @@ 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-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 089d57f5f1..4959949cb3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -271,7 +271,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-geiser-guile (package (name "emacs-geiser-guile") - (version "0.13") + (version "0.17") (source (origin (method git-fetch) @@ -280,9 +280,7 @@ e.g. emacs-geiser-guile for Guile.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0w264pjwlxna31260ll6gd0n77jlynhzf3h2dws5wr7jflns5mbc")) - (patches (search-patches - "emacs-geiser-guile-auto-activate.patch")))) + (base32 "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0")))) (build-system emacs-build-system) (arguments '(#:include (cons "^src/" %default-include) diff --git a/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch b/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch deleted file mode 100644 index 44837f90df..0000000000 --- a/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 -