summaryrefslogtreecommitdiff
path: root/gnu/packages/emacs-xyz.scm
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 /gnu/packages/emacs-xyz.scm
parent9015ed66880497ed88854551eca0510a734fe8f4 (diff)
downloadguix-patches-915d898f1502e64fd59e7948dbbb6cd708012f8d.tar
guix-patches-915d898f1502e64fd59e7948dbbb6cd708012f8d.tar.gz
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.
Diffstat (limited to 'gnu/packages/emacs-xyz.scm')
-rw-r--r--gnu/packages/emacs-xyz.scm37
1 files changed, 20 insertions, 17 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0247874c04..b6696d28f2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -253,20 +253,16 @@ using geiser.")
(define-public emacs-hyperbole
(package
(name "emacs-hyperbole")
- (version "7.0.3")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "http://ftpmirror.gnu.org/hyperbole/"
- "hyperbole-" version ".tar.gz"))
- (sha256
- (base32
- "0znsjhm0lmzpmkgfni4qzx4l6dp604bmrzp3mwxxax2v96wpwmcx"))
- (patches
- (search-patches
- "emacs-hyperbole-do-not-check-dir.patch"
- "emacs-hyperbole-domainname.patch"
- "emacs-hyperbole-toggle-messaging.patch"))))
+ (version "7.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://elpa.gnu.org/packages/"
+ "hyperbole-" version ".tar"))
+ (sha256
+ (base32 "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab"))
+ (patches
+ (search-patches "emacs-hyperbole-toggle-messaging.patch"))))
(build-system emacs-build-system)
(arguments
`(#:include '("DEMO"
@@ -277,10 +273,17 @@ using geiser.")
"\\.kotl$")
#:phases
(modify-phases %standard-phases
- (add-before 'install 'make-info
+ ;; Fix build issues about missing "domainname" and "hpmap:dir-user"
+ ;; parent dir.
+ (add-after 'unpack 'fix-build
(lambda _
- (invoke "make" "info"))))))
- (propagated-inputs `(("inetutils" ,inetutils)))
+ (substitute* "hypb.el"
+ (("(/usr)?/bin/domainname") "/bin/hostname"))
+ (substitute* "hyperbole.el"
+ (("\\(hyperb:check-dir-user\\)") ""))
+ #t)))))
+ (propagated-inputs
+ `(("inetutils" ,inetutils))) ;for hostname
(home-page "https://www.gnu.org/software/hyperbole/")
(synopsis "The Everyday Hypertextual Information Manager")
(description