diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 63 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-git-email-missing-parens.patch | 27 |
3 files changed, 25 insertions, 66 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1723256d49..60fc8c9d94 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1188,7 +1188,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ - %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.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 68532d0c4b..9dd5289bc2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22281,44 +22281,31 @@ created by @code{git format-patch}, from @code{magit}, @code{dired} and (license license:gpl3+))) (define-public emacs-git-email - ;; Use latest commit since latest tagged release is missing important - ;; changes. - (let ((commit "b5ebade3a48dc0ce0c85699f25800808233c73be") - (revision "0")) - (package - (name "emacs-git-email") - (version (git-version "0.2.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~yoctocell/git-email") - (commit commit))) - (patches - (search-patches "emacs-git-email-missing-parens.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lk1yds7idgawnair8l3s72rgjmh80qmy4kl5wrnqvpmjrmdgvnx")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; piem is not yet packaged in Guix. - (add-after 'unpack 'remove-piem - (lambda _ - (delete-file "git-email-piem.el"))) - (add-before 'install 'makeinfo - (lambda _ - (invoke "makeinfo" "doc/git-email.texi")))))) - (native-inputs - (list texinfo)) - (propagated-inputs - (list mu emacs-magit emacs-notmuch)) - (license license:gpl3+) - (home-page "https://sr.ht/~yoctocell/git-email") - (synopsis "Format and send Git patches in Emacs") - (description "This package provides utilities for formatting and -sending Git patches via Email, without leaving Emacs.")))) + (package + (name "emacs-git-email") + (version "0.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/suhail/git-email") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cx6a4dxvdggnjn95a9fhcidd1140srpzw9lx9hi65kancnyjsci")))) + (build-system emacs-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'install 'makeinfo + (lambda _ + (invoke "makeinfo" "doc/git-email.texi")))))) + (inputs (list mu emacs-magit emacs-notmuch emacs-piem)) + (native-inputs (list texinfo)) + (license license:gpl3+) + (home-page "https://suhail.codeberg.page/git-email") + (synopsis "Format and send Git patches in Emacs") + (description "This package provides utilities for formatting and +sending Git patches via Email, without leaving Emacs."))) (define-public emacs-erc-hl-nicks (package diff --git a/gnu/packages/patches/emacs-git-email-missing-parens.patch b/gnu/packages/patches/emacs-git-email-missing-parens.patch deleted file mode 100644 index 051e2bf1eb..0000000000 --- a/gnu/packages/patches/emacs-git-email-missing-parens.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 820ad7eb2e919e3f880bec22bd4f737fa55c4d22 Mon Sep 17 00:00:00 2001 -From: Niklas Eklund <niklas.eklund@posteo.net> -Date: Thu, 5 May 2022 12:43:49 +0200 -Subject: [PATCH] Fix missing parens in git-email-mu4e.el - -The incorrect number of parens in this file lead to Emacs failing to -parse the file. ---- - git-email-mu4e.el | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/git-email-mu4e.el b/git-email-mu4e.el -index d5b8770..9220bf9 100644 ---- a/git-email-mu4e.el -+++ b/git-email-mu4e.el -@@ -51,7 +51,7 @@ from Lisp, enable the mode if ARG is omitted or nil." - ;; built in context feature. - (seq-filter (lambda (header) - (not (eq (car header) 'from))) -- headers) -+ headers)))) - (setq git-email-compose-email-function 'message-mail))) - - (provide 'git-email-mu4e) --- -2.34.0 - |