[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
30/53: gnu: emacs-haskell-mode: Update to 17.5.
From: |
guix-commits |
Subject: |
30/53: gnu: emacs-haskell-mode: Update to 17.5. |
Date: |
Mon, 1 Jan 2024 20:26:06 -0500 (EST) |
ngz pushed a commit to branch master
in repository guix.
commit 47a67d34b2b5f01e7092442cb318c61d1876dc25
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Mon Jan 1 19:03:42 2024 +0100
gnu: emacs-haskell-mode: Update to 17.5.
* gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.5.
* gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): Apply file deletion.
Change-Id: Ic7d11737af87995610ecf2c3178320901991423d
---
gnu/local.mk | 1 -
gnu/packages/emacs-xyz.scm | 6 +-
.../emacs-haskell-mode-no-redefine-builtin.patch | 75 ----------------------
3 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 264b186f41..4b2393bfdd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1114,7 +1114,6 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-git-email-missing-parens.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
- %D%/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch \
%D%/packages/patches/emacs-helpful-fix-tests.patch \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
%D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a7828773dd..848eaa7ecb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2403,7 +2403,7 @@ replacement.")
(define-public emacs-haskell-mode
(package
(name "emacs-haskell-mode")
- (version "17.4")
+ (version "17.5")
(source
(origin
(method git-fetch)
@@ -2412,9 +2412,7 @@ replacement.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n"))
- (patches
- (search-patches "emacs-haskell-mode-no-redefine-builtin.patch"))))
+ (base32 "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf"))))
(propagated-inputs
(list emacs-dash))
(native-inputs
diff --git a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch
b/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch
deleted file mode 100644
index 65ace2ee5e..0000000000
--- a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From faa95a784d2c74c72e70367a5d531df6dd61aeab Mon Sep 17 00:00:00 2001
-From: Steve Purcell <steve@sanityinc.com>
-Date: Sun, 6 Aug 2023 16:41:48 +0200
-Subject: [PATCH] Don't redefine built-in function
-
-Fixes #1817
----
- tests/haskell-indent-tests.el | 14 ++++++++------
- tests/haskell-indentation-tests.el | 14 ++++++++------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/tests/haskell-indent-tests.el b/tests/haskell-indent-tests.el
-index 7196405b8..9a3de4ad3 100644
---- a/tests/haskell-indent-tests.el
-+++ b/tests/haskell-indent-tests.el
-@@ -40,11 +40,13 @@
- ;; (haskell-indent-put-region-in-literate (point-min)
(point-max) -1)
- ;; (buffer-substring-no-properties (point-min)
(point-max))))))
-
--(defsubst string-trim-left (string)
-- "Remove leading whitespace from STRING."
-- (if (string-match "\\`[ \t\n\r]+" string)
-- (replace-match "" t t string)
-- string))
-+(if (fboundp 'string-trim-left)
-+ (defalias 'haskell--string-trim-left 'string-trim-left)
-+ (defun haskell--string-trim-left (string &optional regexp)
-+ "Remove leading whitespace from STRING."
-+ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)")
string)
-+ (substring string (match-end 0))
-+ string)))
-
- (defun haskell-indent-format-info (info)
- (if (cdr info)
-@@ -128,7 +130,7 @@ macro quotes them for you."
- :expected-result
- ,(if allow-failure :failed :passed)
- (haskell-indent-check
-- ,(string-trim-left source)
-+ ,(haskell--string-trim-left source)
- ,@(mapcar (lambda (x)
- (list 'quote x))
- test-cases))))))
-diff --git a/tests/haskell-indentation-tests.el
b/tests/haskell-indentation-tests.el
-index 4889b76a7..cd783a4f4 100644
---- a/tests/haskell-indentation-tests.el
-+++ b/tests/haskell-indentation-tests.el
-@@ -33,11 +33,13 @@
-
- ;;; Code:
-
--(defsubst string-trim-left (string)
-- "Remove leading whitespace from STRING."
-- (if (string-match "\\`[ \t\n\r]+" string)
-- (replace-match "" t t string)
-- string))
-+(if (fboundp 'string-trim-left)
-+ (defalias 'haskell--string-trim-left 'string-trim-left)
-+ (defun haskell--string-trim-left (string &optional regexp)
-+ "Remove leading whitespace from STRING."
-+ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)")
string)
-+ (substring string (match-end 0))
-+ string)))
-
- (defun haskell-indentation-check (source &rest test-cases)
- "Check if `haskell-indentation-find-indentations' returns expected results.
-@@ -115,7 +117,7 @@ macro quotes them for you."
- :expected-result
- ,(if allow-failure :failed :passed)
- (haskell-indentation-check
-- ,(string-trim-left source)
-+ ,(haskell--string-trim-left source)
- ,@(mapcar (lambda (x)
- (list 'quote x))
- test-cases))))))
- 06/53: gnu: emacs-tramp: Update to 2.6.2.0., (continued)
- 06/53: gnu: emacs-tramp: Update to 2.6.2.0., guix-commits, 2024/01/01
- 08/53: gnu: emacs-vertico-posframe: Update to 0.7.5., guix-commits, 2024/01/01
- 14/53: gnu: emacs-cape: Update to 1.1., guix-commits, 2024/01/01
- 11/53: gnu: emacs-buttercup: Update to 1.33., guix-commits, 2024/01/01
- 12/53: gnu: emacs-async: Update to 1.9.8., guix-commits, 2024/01/01
- 16/53: gnu: emacs-clj-refactor: Update to 3.11.2., guix-commits, 2024/01/01
- 18/53: gnu: emacs-code-cells: Update to 0.4., guix-commits, 2024/01/01
- 27/53: gnu: emacs-emms-print-metadata: Update to 17., guix-commits, 2024/01/01
- 28/53: gnu: emacs-geiser: Update to 0.30., guix-commits, 2024/01/01
- 29/53: gnu: emacs-gptel: Update to 0.5.5., guix-commits, 2024/01/01
- 30/53: gnu: emacs-haskell-mode: Update to 17.5.,
guix-commits <=
- 32/53: gnu: emacs-inf-ruby: Update to 2.8.1., guix-commits, 2024/01/01
- 37/53: gnu: emacs-marginalia: Update to 1.5., guix-commits, 2024/01/01
- 07/53: gnu: emacs-ebdb: Update to 0.8.20., guix-commits, 2024/01/01
- 15/53: gnu: emacs-cider: Update to 1.12.0., guix-commits, 2024/01/01
- 10/53: gnu: emacs-beframe: Update to 1.0.0., guix-commits, 2024/01/01
- 17/53: gnu: emacs-clojure-mode: Update to 5.18.1., guix-commits, 2024/01/01
- 20/53: gnu: emacs-consult-flycheck: Update to 1.0., guix-commits, 2024/01/01
- 26/53: gnu: emacs-eldev: Update to 1.8.1., guix-commits, 2024/01/01
- 09/53: gnu: emacs-apheleia: Update to 4.0., guix-commits, 2024/01/01
- 13/53: gnu: emacs-async: Run tests., guix-commits, 2024/01/01