summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-20 23:41:45 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-20 23:41:45 +0200
commit915d898f1502e64fd59e7948dbbb6cd708012f8d (patch)
tree743d5d05447fec9026889818ed69537a03f06bb9
parentgnu: gnutls: Pass #:tests? unconditionally. (diff)
downloadguix-915d898f1502e64fd59e7948dbbb6cd708012f8d.tar.gz
guix-915d898f1502e64fd59e7948dbbb6cd708012f8d.tar.bz2
guix-915d898f1502e64fd59e7948dbbb6cd708012f8d.tar.xz
gnu: emacs-hyperbole: Update to 7.0.6.
* gnu/packages/emacs-xyz.scm (emacs-hyperbole): Update to 7.0.6. [source]: Use GNU ELPA URL. Remove some patches. [arguments]: Add phase. * gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch: Delete file. * gnu/packages/patches/emacs-hyperbole-domainname.patch: Delete file. * gnu/local.mk: Register sole patch.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/emacs-xyz.scm37
-rw-r--r--gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch24
-rw-r--r--gnu/packages/patches/emacs-hyperbole-domainname.patch29
4 files changed, 21 insertions, 70 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index fd3cc88..090d0ee 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -891,6 +891,7 @@ dist_patch_DATA = \
891 %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ 891 %D%/packages/patches/emacs-fix-scheme-indent-function.patch \
892 %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ 892 %D%/packages/patches/emacs-json-reformat-fix-tests.patch \
893 %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ 893 %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
894 %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \
894 %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ 895 %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
895 %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ 896 %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
896 %D%/packages/patches/emacs-source-date-epoch.patch \ 897 %D%/packages/patches/emacs-source-date-epoch.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0247874..b6696d2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -253,20 +253,16 @@ using geiser.")
253(define-public emacs-hyperbole 253(define-public emacs-hyperbole
254 (package 254 (package
255 (name "emacs-hyperbole") 255 (name "emacs-hyperbole")
256 (version "7.0.3") 256 (version "7.0.6")
257 (source (origin 257 (source
258 (method url-fetch) 258 (origin
259 (uri (string-append 259 (method url-fetch)
260 "http://ftpmirror.gnu.org/hyperbole/" 260 (uri (string-append "https://elpa.gnu.org/packages/"
261 "hyperbole-" version ".tar.gz")) 261 "hyperbole-" version ".tar"))
262 (sha256 262 (sha256
263 (base32 263 (base32 "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab"))
264 "0znsjhm0lmzpmkgfni4qzx4l6dp604bmrzp3mwxxax2v96wpwmcx")) 264 (patches
265 (patches 265 (search-patches "emacs-hyperbole-toggle-messaging.patch"))))
266 (search-patches
267 "emacs-hyperbole-do-not-check-dir.patch"
268 "emacs-hyperbole-domainname.patch"
269 "emacs-hyperbole-toggle-messaging.patch"))))
270 (build-system emacs-build-system) 266 (build-system emacs-build-system)
271 (arguments 267 (arguments
272 `(#:include '("DEMO" 268 `(#:include '("DEMO"
@@ -277,10 +273,17 @@ using geiser.")
277 "\\.kotl$") 273 "\\.kotl$")
278 #:phases 274 #:phases
279 (modify-phases %standard-phases 275 (modify-phases %standard-phases
280 (add-before 'install 'make-info 276 ;; Fix build issues about missing "domainname" and "hpmap:dir-user"
277 ;; parent dir.
278 (add-after 'unpack 'fix-build
281 (lambda _ 279 (lambda _
282 (invoke "make" "info")))))) 280 (substitute* "hypb.el"
283 (propagated-inputs `(("inetutils" ,inetutils))) 281 (("(/usr)?/bin/domainname") "/bin/hostname"))
282 (substitute* "hyperbole.el"
283 (("\\(hyperb:check-dir-user\\)") ""))
284 #t)))))
285 (propagated-inputs
286 `(("inetutils" ,inetutils))) ;for hostname
284 (home-page "https://www.gnu.org/software/hyperbole/") 287 (home-page "https://www.gnu.org/software/hyperbole/")
285 (synopsis "The Everyday Hypertextual Information Manager") 288 (synopsis "The Everyday Hypertextual Information Manager")
286 (description 289 (description
diff --git a/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch b/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch
deleted file mode 100644
index 66c7a0f..0000000
--- a/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 3016fbd61e47978be73bbbaf7a8c2709bec42066 Mon Sep 17 00:00:00 2001
2From: Joseph LaFreniere <joseph@lafreniere.xyz>
3Date: Fri, 12 Jul 2019 13:12:40 -0500
4Subject: [PATCH] Do not run hyperb:check-dir-user during initialization
5
6---
7 hyperbole.el | 1 -
8 1 file changed, 1 deletion(-)
9
10diff --git a/hyperbole.el b/hyperbole.el
11index 872dbaf..6edb2a7 100644
12--- a/hyperbole.el
13+++ b/hyperbole.el
14@@ -653,7 +653,6 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden."
15 (interactive)
16 (message "Initializing Hyperbole...")
17 (run-hooks 'hyperbole-init-hook)
18- (hyperb:check-dir-user)
19 (or (stringp hyperb:user-email)
20 (setq hyperb:user-email
21 (or (and (boundp 'user-mail-address)
22--
232.22.0
24
diff --git a/gnu/packages/patches/emacs-hyperbole-domainname.patch b/gnu/packages/patches/emacs-hyperbole-domainname.patch
deleted file mode 100644
index cf4b63b..0000000
--- a/gnu/packages/patches/emacs-hyperbole-domainname.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 17c87ac58ce6d475fa1987347fcb868ef7f75e40 Mon Sep 17 00:00:00 2001
2From: Joseph LaFreniere <joseph@lafreniere.xyz>
3Date: Sun, 2 Jun 2019 12:38:27 -0500
4Subject: [PATCH] Replace executable domainname with hostname
5
6Fixes build failure:
7> ice-9/boot-9.scm:752:25: In procedure dispatch-exception:
8> patch-el-files: unable to locate "domainname"
9---
10 hypb.el | 3 +--
11 1 file changed, 1 insertion(+), 2 deletions(-)
12
13diff --git a/hypb.el b/hypb.el
14index 6abc17a..0332946 100644
15--- a/hypb.el
16+++ b/hypb.el
17@@ -183,8 +183,7 @@ Global keymap is used unless optional KEYMAP is given."
18
19 (defun hypb:domain-name ()
20 "Returns current Internet domain name with '@' prepended or nil if none."
21- (let* ((dname-cmd (or (file-exists-p "/usr/bin/domainname")
22- (file-exists-p "/bin/domainname")))
23+ (let* ((dname-cmd (file-exists-p "/bin/hostname"))
24 (dname (or (and (boundp 'message-user-fqdn) (stringp message-user-fqdn)
25 (string-match "\\." message-user-fqdn)
26 message-user-fqdn)
27--
282.21.0
29