From bc66d351649f39b2dd2c00a664e47e54b1d161f4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 9 Jan 2021 11:38:02 +0100 Subject: [PATCH] gnu: emacs-scheme-complete: Update to 0.9.9. * gnu/packages/emacs-xyz.scm (emacs-scheme-complete): Update to 0.9.9. * gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch: Remove file. * gnu/local.mk: Update file. --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 11 +++++------ .../emacs-scheme-complete-scheme-r5rs-info.patch | 14 -------------- 3 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1151d4642e..ec3d6137e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -958,7 +958,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ - %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-patch-server-functions.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 08cbb70b0a..c86452fe2b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5722,10 +5722,12 @@ (define-public emacs-sbt-mode (license license:gpl3+))) (define-public emacs-scheme-complete - (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) + ;; Upstream does not provide tags. The commit below corresponds to the + ;; exact version update. Version is extracted from main file. + (let ((commit "5c0a16684a3be7021d67067b2955f1c3e17a320a")) (package (name "emacs-scheme-complete") - (version (string-append "20151223." (string-take commit 8))) + (version "0.9.9") (source (origin (method git-fetch) @@ -5734,10 +5736,7 @@ (define-public emacs-scheme-complete (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "141wn9l0m33w0g3dqmx8nxbfdny1r5xbr6ak61rsz21bk0qafs7x")) - (patches - (search-patches "emacs-scheme-complete-scheme-r5rs-info.patch")))) + (base32 "1smxr5bkzbfrjx21vhrj1wagmqx5yd92i997dbgs16iaqbzzr7cz")))) (build-system emacs-build-system) (home-page "https://github.com/ashinn/scheme-complete") (synopsis "Smart tab completion for Scheme in Emacs") diff --git a/gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch b/gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch deleted file mode 100644 index 6c49bdcdde..0000000000 --- a/gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix completion for R5RS Scheme. -See https://github.com/ashinn/scheme-complete/issues/1 - ---- scheme-complete-master/scheme-complete.el.orig 2015-12-25 21:59:09.896909029 +0100 -+++ scheme-complete-master/scheme-complete.el 2015-12-25 21:59:17.924993998 +0100 -@@ -591,7 +591,7 @@ - '((exact->inexact (lambda (z) z)) - (inexact->exact (lambda (z) z))) - (mapcar #'(lambda (x) -- (list x (scheme-env-lookup *scheme-r7rs-info* x))) -+ (scheme-env-lookup *scheme-r7rs-info* x)) - *scheme-r5rs-bindings*)))) - *scheme-r5rs-info*) -