From 00bdf501dfb1cc5adeaff176c1ec9f670535fb3c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 30 Mar 2018 23:16:10 -0400 Subject: gnu: emacs-cdlatex: Fix byte compilation. * gnu/packages/emacs.scm (emacs-cdlatex)[propagated-inputs]: Add emacs-auctex. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cb722844cc..a5cb472118 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5514,6 +5514,8 @@ (define-public emacs-cdlatex (base32 "0pivapphmykc6vhvpx7hdyl55ls37vc4jcrxpvs4yk7jzcmwa9xp")))) (build-system emacs-build-system) + (propagated-inputs + `(("emacs-auctex" ,emacs-auctex))) (home-page "https://github.com/cdominik/cdlatex") (synopsis "Fast Emacs input methods for LaTeX environments and math") -- cgit v1.2.3 From bae8e59e9d860a94f1c318e77898823dc049f88e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 30 Mar 2018 21:18:16 -0400 Subject: gnu: Add emacs-spark. * gnu/packages/emacs.scm (emacs-spark): New variable. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a5cb472118..e9df70db4b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1908,6 +1908,31 @@ (define-public emacs-espuds definitions for testing with the Ecukes framework.") (license license:gpl3+))) +(define-public emacs-spark + (let ((version "20160503") ; no proper tag, use date of commit + (commit "0bf148c3ede3b31d56fd75f347cdd0b0eae60025") + (revision "1")) + (package + (name "emacs-spark") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alvinfrancis/spark.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ykqr86j17mi95s08d9fp02d7ych1331b04dcqxzxnmpkhwngyj1")))) + (build-system emacs-build-system) + (home-page "https://github.com/alvinfrancis/spark") + (synopsis "Sparkline generation library for Emacs Lisp") + (description "@code{emacs-spark} is a sparkline generation library for +Emacs Lisp. It generates a sparkline string given a list of numbers. It is a +port of @code{cl-spark} to Emacs Lisp.") + (license license:expat)))) + (define-public emacs-es-mode (package (name "emacs-es-mode") -- cgit v1.2.3 From a262ac68d697401f5ec88a9d3fb25844a7b4b7ad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 30 Mar 2018 21:18:36 -0400 Subject: gnu: emacs-es-mode: Fix byte compilation. * gnu/packages/emacs.scm (emacs-es-mode)[propagated-inputs]: Add emacs-dash and emacs-spark. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e9df70db4b..f580029646 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1950,7 +1950,9 @@ (define-public emacs-es-mode (propagated-inputs ;; The version of org in Emacs 24.5 is not sufficient, and causes tables ;; to be rendered incorrectly - `(("emacs-org" ,emacs-org))) + `(("emacs-dash" ,emacs-dash) + ("emacs-org" ,emacs-org) + ("emacs-spark" ,emacs-spark))) (home-page "https://github.com/dakrone/es-mode") (synopsis "Major mode for editing Elasticsearch queries") (description "@code{es-mode} includes highlighting, completion and -- cgit v1.2.3 From c4373a60685a594f796b7aefff79d2ded17a15a4 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 14 Apr 2018 03:38:53 +0530 Subject: gnu: emacs-es-mode: Update to 4.3.0. * gnu/packages/emacs.scm (emacs-es-mode): Update to 4.3.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f580029646..6456d5bdaf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1936,7 +1936,7 @@ (define-public emacs-spark (define-public emacs-es-mode (package (name "emacs-es-mode") - (version "4.2.0") + (version "4.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1945,7 +1945,7 @@ (define-public emacs-es-mode (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02as82clm553yss7jfjac888308zr1h2229cch4z1yij70j25c8y")))) + "0y86qdcb3g7fkcb4pzsjh3syzql6w3314hg1wqxq4a8bbk3y0cgr")))) (build-system emacs-build-system) (propagated-inputs ;; The version of org in Emacs 24.5 is not sufficient, and causes tables -- cgit v1.2.3 From 80c4aabbadc877fb652e84ea975bbdd068eed81a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 30 Mar 2018 20:41:48 -0400 Subject: gnu: emacs-evil-matchit: Fix byte compilation. * gnu/packages/emacs.scm (emacs-evil-matchit)[propagated-inputs]: Add emacs-evil. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6456d5bdaf..1bb5228b71 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7057,6 +7057,8 @@ (define-public emacs-evil-matchit (base32 "1hm0k53m7d8zv2pk4p93k5mmilsv1mz7y2z6dqf7r6f0zmncs31a")))) (build-system emacs-build-system) + (propagated-inputs + `(("emacs-evil" ,emacs-evil))) (home-page "https://github.com/redguardtoo/evil-matchit") (synopsis "Vim matchit ported into Emacs") (description -- cgit v1.2.3 From 9a910133d3381ca4ca283db9a539f481c4c7a929 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 14 Apr 2018 03:59:48 +0530 Subject: gnu: emacs-evil-matchit: Update to 2.2.6. * gnu/packages/emacs.scm (emacs-evil-matchit): Update to 2.2.6. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1bb5228b71..baa61093c6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7045,7 +7045,7 @@ (define-public eless (define-public emacs-evil-matchit (package (name "emacs-evil-matchit") - (version "2.2.5") + (version "2.2.6") (source (origin (method url-fetch) @@ -7055,7 +7055,7 @@ (define-public emacs-evil-matchit (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1hm0k53m7d8zv2pk4p93k5mmilsv1mz7y2z6dqf7r6f0zmncs31a")))) + "1yp9sl6542317mn1060ri90zyf6bs6qylagndhqy02p368q31rhi")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From b6efe0e81f8675ae96c3a99f2713192dc14ad4de Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 28 Mar 2018 20:56:18 -0400 Subject: gnu: emacs-mu4e-alert: Fix byte compilation. * gnu/packages/emacs.scm (emacs-mu4e-alert)[propagated-inputs]: Add mu. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index baa61093c6..7094878fa2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -90,6 +90,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages xml) #:use-module (gnu packages glib) #:use-module (gnu packages acl) + #:use-module (gnu packages mail) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) @@ -4972,7 +4973,8 @@ (define-public emacs-mu4e-alert (propagated-inputs `(("emacs-alert" ,emacs-alert) ("emacs-s" ,emacs-s) - ("emacs-ht" ,emacs-ht))) + ("emacs-ht" ,emacs-ht) + ("mu" ,mu))) (home-page "https://github.com/iqbalansari/mu4e-alert") (synopsis "Desktop notification for mu4e") (description -- cgit v1.2.3 From db95d8ca929e3320807cf875e11dfcc11acaab78 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:05:28 -0400 Subject: gnu: emacs-smartparens: Fix byte compilation. * gnu/packages/emacs.scm (emacs-smartparens)[propagated-inputs]: Add emacs-markdown-mode. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7094878fa2..5cf20194e3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3102,7 +3102,9 @@ (define-public emacs-smartparens (base32 "0q5as813xs8y29i3v2rm97phd6m7xsmmw6hwbvx57gwmi8i1c409")))) (build-system emacs-build-system) - (propagated-inputs `(("emacs-dash" ,emacs-dash))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-markdown-mode" ,emacs-markdown-mode))) (home-page "https://github.com/Fuco1/smartparens") (synopsis "Paredit-like insertion, wrapping and navigation with user defined pairs") -- cgit v1.2.3 From 1fcd7e6c356b77c4ed0dd6f52ec9c6c8308af185 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 14:15:45 -0400 Subject: gnu: Add emacs-ert-expectations. * gnu/packages/emacs.scm (emacs-ert-expectations): New variable. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5cf20194e3..26602c0ab5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2460,6 +2460,24 @@ (define-public emacs-debbugs Tracker as well as bug identifiers prepared for @code{bug-reference-mode}.") (license license:gpl3+))) +(define-public emacs-ert-expectations + (package + (name "emacs-ert-expectations") + (version "0.2") + (source + (origin + (method url-fetch) + (uri "https://www.emacswiki.org/emacs/download/ert-expectations.el") + (sha256 + (base32 + "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/ert-expectations.el") + (synopsis "Simple unit test framework for Emacs Lisp") + (description "@code{emacs-ert-expectations} is a simple unit test +framework for Emacs Lisp to be used with @code{ert}.") + (license license:gpl3+))) + (define-public emacs-deferred (package (name "emacs-deferred") -- cgit v1.2.3 From 8865d476f3143cf584ac89e9d4bb21c3460d4901 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:03:35 -0400 Subject: gnu: emacs-org-trello: Fix byte compilation. * gnu/packages/emacs.scm (emacs-org-trello)[propagated-inputs]: Add emacs-f and emacs-helm. Sort. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 26602c0ab5..aded19a19f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2990,9 +2990,11 @@ (define-public emacs-org-trello "074dka8g673bj1ck5vavbjaij5jyniygdlw51mdds005wd2br9wf")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-deferred" ,emacs-deferred) + `(("emacs-dash" ,emacs-dash) + ("emacs-deferred" ,emacs-deferred) + ("emacs-f" ,emacs-f) + ("emacs-helm" ,emacs-helm) ("emacs-request" ,emacs-request) - ("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s))) (home-page "https://org-trello.github.io") (synopsis "Emacs minor mode for interacting with Trello") -- cgit v1.2.3 From bf86533bf8c3c308e68292fbed55e45acddaef03 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 14 Apr 2018 15:55:26 +0530 Subject: gnu: emacs-org-trello: Update to 0.8.0. * gnu/packages/emacs.scm (emacs-org-trello): Update to 0.8.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index aded19a19f..2ac6575eaa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2978,7 +2978,7 @@ (define-public emacs-org-pomodoro (define-public emacs-org-trello (package (name "emacs-org-trello") - (version "0.7.9") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append @@ -2987,7 +2987,7 @@ (define-public emacs-org-trello (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "074dka8g673bj1ck5vavbjaij5jyniygdlw51mdds005wd2br9wf")))) + "0549mnf5cgwn8b8jbl38fljbaxmh1605sv9j8f3lsa95jhs1zpa0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 4e782ffff7feb64f911bdb595178fbb0480a3ad8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:11:53 -0400 Subject: gnu: emacs-request: Fix byte compilation. * gnu/packages/emacs.scm (emacs-request)[propagated-inputs]: Add emacs-deferred. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2ac6575eaa..d39b5b5275 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3357,6 +3357,8 @@ (define-public emacs-request (base32 "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7")))) (build-system emacs-build-system) + (propagated-inputs + `(("emacs-deferred" ,emacs-deferred))) (home-page "https://github.com/tkf/emacs-request") (synopsis "Package for speaking HTTP in Emacs Lisp") (description "This package provides a HTTP request library with multiple -- cgit v1.2.3 From de5256d3bb3fbeb5315cda68a2355ac9d8c7a8eb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 30 Mar 2018 21:46:35 -0400 Subject: gnu: Add emacs-eimp. * gnu/packages/emacs.scm (emacs-eimp): New variable. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d39b5b5275..9b8dd2352a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6346,6 +6346,45 @@ (define-public emacs-restclient displays results pretty-printed in XML or JSON with @code{restclient-mode}") (license license:public-domain)))) +(define-public emacs-eimp + (let ((version "1.4.0") + (commit "2e7536fe6d8f7faf1bad7a8ae37faba0162c3b4f") + (revision "1")) + (package + (name "emacs-eimp") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nicferrier/eimp.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "154d57yafxbcf39r89n5j43c86rp2fki3lw3gwy7ww2g6qkclcra")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((imagemagick (assoc-ref inputs "imagemagick"))) + ;; eimp.el is read-only in git. + (chmod "eimp.el" #o644) + (emacs-substitute-variables "eimp.el" + ("eimp-mogrify-program" + (string-append imagemagick "/bin/mogrify")))) + #t))))) + (inputs + `(("imagemagick" ,imagemagick))) + (home-page "https://github.com/nicferrier/eimp") + (synopsis "Interactive image manipulation utility for Emacs") + (description "@code{emacs-eimp} allows interactive image manipulation +from within Emacs. It uses the code@{mogrify} utility from ImageMagick to do +the actual transformations.") + (license license:gpl2+)))) + (define-public emacs-dired-hacks (let ((commit "eda68006ce73bbf6b9b995bfd70d08bec8cade36") (revision "1")) -- cgit v1.2.3 From fee23c17a9792e0463f10fbde837ab9bde3b7a03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 30 Mar 2018 22:56:29 -0400 Subject: gnu: emacs-dired-hacks: Fix byte compilation. * gnu/packages/emacs.scm (emacs-dired-hacks)[propagated-inputs]: Add emacs-eimp. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9b8dd2352a..def4ab1129 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6404,6 +6404,7 @@ (define-public emacs-dired-hacks (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-eimp" ,emacs-eimp) ("emacs-f" ,emacs-f) ("emacs-s" ,emacs-s))) (home-page "https://github.com/Fuco1/dired-hacks") -- cgit v1.2.3 From 74b4d7a142193ea6006268139c79a1e68f0e9fb1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Mar 2018 21:55:27 -0400 Subject: gnu: emacs-polymode: Fix byte compilation. * gnu/packages/emacs.scm (emacs-polymode)[arguments]: Add modes subdirectory to #:include. Add add-modes-subdir-to-load-path phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index def4ab1129..fa05b983db 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7041,6 +7041,15 @@ (define-public emacs-polymode (base32 "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh")))) (build-system emacs-build-system) + (arguments + `(#:include (cons* "^modes/.*\\.el$" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'set-emacs-load-path 'add-modes-subdir-to-load-path + (lambda _ + (setenv "EMACSLOADPATH" + (string-append (getenv "EMACSLOADPATH") + ":" (getcwd) "/modes" ":"))))))) (home-page "https://github.com/vspinu/polymode") (synopsis "Framework for multiple Emacs modes based on indirect buffers") (description "Polymode is an Emacs package that offers generic support -- cgit v1.2.3 From 086bfb37af3db6833992bfb0321713c74690d994 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 20 Mar 2018 19:11:19 +0300 Subject: gnu: Add emacs-pg. * gnu/packages/emacs.scm (emacs-pg): New public variable. --- gnu/packages/emacs.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fa05b983db..c455a142d6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7645,3 +7645,23 @@ (define-public emacs-evil-anzu (description "@code{anzu} provides a minor mode that displays the current match and total match information in the mode-line in various search modes.") (license license:gpl3+))) + +(define-public emacs-pg + (let ((commit "4f6516ec3946d95dcef49abb6703cc89ecb5183d")) + (package + (name "emacs-pg") + (version (git-version "0.1" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/cbbrowne/pg.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0")))) + (build-system emacs-build-system) + (home-page "https://github.com/cbbrowne/pg.el") + (synopsis "Emacs Lisp interface for PostgreSQL") + (description + "This package provides an Emacs Lisp interface for PostgreSQL.") + (license license:gpl3+)))) -- cgit v1.2.3 From 5b6d67476056fdadfad2de21b5fc4ff14999c047 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 20 Mar 2018 19:06:48 +0300 Subject: gnu: Add emacs-cl-generic. * gnu/packages/emacs.scm (emacs-cl-generic): New public variable. --- gnu/packages/emacs.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c455a142d6..9d212eee37 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7665,3 +7665,24 @@ (define-public emacs-pg (description "This package provides an Emacs Lisp interface for PostgreSQL.") (license license:gpl3+)))) + +(define-public emacs-cl-generic + (package + (name "emacs-cl-generic") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/cl-generic-" + version ".el")) + (sha256 + (base32 + "0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq")))) + (build-system emacs-build-system) + (home-page "https://elpa.gnu.org/packages/seq.html") + (synopsis + "Forward @code{cl-generic} compatibility for Emacs before version 25") + (description "This package provides a subset of the features of the +@code{cl-generic} package introduced in Emacs-25, for use on previous +@code{emacsen}.") + (license license:gpl3+))) -- cgit v1.2.3 From 6c92b4406fa2dab28db975ab64256f218a66a961 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 20 Mar 2018 19:07:39 +0300 Subject: gnu: Add emacs-finalize. * gnu/packages/emacs.scm (emacs-finalize): New public variable. --- gnu/packages/emacs.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9d212eee37..b371eadaf6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7686,3 +7686,28 @@ (define-public emacs-cl-generic @code{cl-generic} package introduced in Emacs-25, for use on previous @code{emacsen}.") (license license:gpl3+))) + +(define-public emacs-finalize + (package + (name "emacs-finalize") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/skeeto/elisp-finalize/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "077fycy3i5f0kjw5z3rhf4kld5lbk2idz690nkwhkz04vppk4q4x")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-cl-generic" ,emacs-cl-generic))) + (home-page "https://github.com/skeeto/elisp-finalize") + (synopsis "Finalizers for Emacs Lisp") + (description + "This package will allows to immediately run a callback (a finalizer) +after its registered lisp object has been garbage collected. This allows for +extra resources, such as buffers and processes, to be cleaned up after the +object has been freed.") + (license license:unlicense))) -- cgit v1.2.3 From 4d089b5e56420c05a21d138c4c5832cf7ba6e98a Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 20 Mar 2018 19:08:07 +0300 Subject: gnu: Add emacs-emacsql. * gnu/packages/emacs.scm (emacs-emacsql): New public variable. --- gnu/packages/emacs.scm | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b371eadaf6..f9da1007e3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -66,6 +66,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages audio) #:use-module (gnu packages bash) #:use-module (gnu packages code) + #:use-module (gnu packages databases) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -7711,3 +7712,84 @@ (define-public emacs-finalize extra resources, such as buffers and processes, to be cleaned up after the object has been freed.") (license license:unlicense))) + +(define-public emacs-emacsql + (package + (name "emacs-emacsql") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/skeeto/emacsql/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04hfjdgl1zc7jysgjc7d7d3xqpr7q1q9gsmzffjd91ii3hpqjgx6")))) + (build-system emacs-build-system) + (arguments + `(#:modules ((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (delete 'build) ;‘build-emacsql-sqlite’ compiles ‘*.el’ files. + (add-before 'install 'patch-elisp-shell-shebangs + (lambda _ + (substitute* (find-files "." "\\.el") + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'patch-elisp-shell-shebangs 'setenv-shell + (lambda _ + (setenv "SHELL" "sh"))) + (add-after 'setenv-shell 'build-emacsql-sqlite + (lambda _ + (invoke "make" "binary" "CC=gcc"))) + (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite + ;; This build phase installs emacs-emacsql binary. + (lambda* (#:key outputs #:allow-other-keys) + (install-file "sqlite/emacsql-sqlite" + (string-append (assoc-ref outputs "out") + "/bin")) + #t)) + (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el + ;; This build phase removes interactive prompts + ;; and makes sure Emacs look for binaries in the right places. + (lambda* (#:key outputs #:allow-other-keys) + (let ((file "emacsql-sqlite.el")) + (chmod file #o644) + (emacs-substitute-sexps file + ;; Avoid interactive prompts. + ("(defvar emacsql-sqlite-user-prompted" 't) + ;; Make sure Emacs looks for ‘GCC’ binary in the right place. + ("(executable-find" (which "gcc")) + ;; Make sure Emacs looks for ‘emacsql-sqlite’ binary + ;; in the right place. + ("(defvar emacsql-sqlite-executable" + (string-append (assoc-ref outputs "out") + "/bin/emacsql-sqlite")))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (install-file "sqlite/emacsql-sqlite" + (string-append out "/bin")) + (for-each (cut install-file <> + (string-append out "/share/emacs/site-lisp/guix.d/" + "emacsql" "-" ,version)) + (find-files "." "\\.elc*$"))) + #t))))) + (inputs + `(("emacs-minimal" ,emacs-minimal) + ("mysql" ,mysql) + ("postgresql" ,postgresql))) + (propagated-inputs + `(("emacs-finalize" ,emacs-finalize) + ("emacs-pg" ,emacs-pg))) + (home-page "https://github.com/skeeto/emacsql") + (synopsis "Emacs high-level SQL database front-end") + (description "Any readable Lisp value can be stored as a value in EmacSQL, +including numbers, strings, symbols, lists, vectors, and closures. EmacSQL +has no concept of @code{TEXT} values; it's all just Lisp objects. The Lisp +object @code{nil} corresponds 1:1 with @code{NULL} in the database.") + (license license:gpl3+))) -- cgit v1.2.3 From 93aba854dbc559e863d1127a30cdb60eadaa113b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 20 Mar 2018 19:08:29 +0300 Subject: gnu: Add emacs-closql. * gnu/packages/emacs.scm (emacs-closql): New public variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f9da1007e3..ee3fe145fb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7793,3 +7793,29 @@ (define-public emacs-emacsql has no concept of @code{TEXT} values; it's all just Lisp objects. The Lisp object @code{nil} corresponds 1:1 with @code{NULL} in the database.") (license license:gpl3+))) + +(define-public emacs-closql + (package + (name "emacs-closql") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/emacscollective/closql/archive/" + "v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wa6r0kgbb7f19039p5f3di4dvrvxfgpd8bkam94fca7jvzj536c")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-emacsql" ,emacs-emacsql))) + (home-page "https://github.com/emacscollective/closql") + (synopsis "Store EIEIO objects using EmacSQL") + (description + "This package allows to store uniform EIEIO objects in an EmacSQL +database. SQLite is used as backend. This library imposes some restrictions +on what kind of objects can be stored; it isn't intended to store arbitrary +objects. All objects have to share a common superclass and subclasses cannot +add any additional instance slots.") + (license license:gpl3))) -- cgit v1.2.3 From 452454e30cfde183bb3b8954b844a9d6c9f81bcc Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 20 Mar 2018 19:09:04 +0300 Subject: gnu: Add emacs-epkg. * gnu/packages/emacs.scm (emacs-epkg): New public variable. --- gnu/packages/emacs.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ee3fe145fb..e2b901cd3a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7819,3 +7819,47 @@ (define-public emacs-closql objects. All objects have to share a common superclass and subclasses cannot add any additional instance slots.") (license license:gpl3))) + +(define-public emacs-epkg + ;; The release version is to old for the current database scheme. + (let ((commit "432312b9583ed7b88ad9644fd1bf2183765a892e")) + (package + (name "emacs-epkg") + (version (git-version "3.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacscollective/epkg.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d882kahn7a0vri7a9r15lvmfx1zn2hsga6jfcc6jv0hqbswlb2k")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-closql" ,emacs-closql) + ("emacs-dash" ,emacs-dash))) + (home-page "https://emacsmirror.net") + (synopsis "Browse the Emacsmirror package database") + (description "This package provides access to a local copy of the +Emacsmirror package database. It provides low-level functions for querying +the database and a @file{package.el} user interface for browsing the database. +Epkg itself is not a package manager. + +Getting a local copy: + +@example +git clone https://github.com/emacsmirror/epkgs.git ~/.emacs.d/epkgs +cd ~/.emacs.d/epkgs +git submodule init +git config --global url.https://github.com/.insteadOf git@@github.com: +git submodule update +@end example + +Some submodule may be missing. In this case Git will prompt for a GitHub user +name and password. To skip it press a @key{Return} key. + +You could get a Epkg package list by invoking @code{epkg-list-packages} in +Emacs.") + (license license:gpl3+)))) -- cgit v1.2.3 From de893dda28b38903d915fdf50fb754bd9cbab39f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 17 Apr 2018 10:56:11 +0530 Subject: gnu: emacs-emms-player-mpv: Update to 0.1.0. * gnu/packages/emacs.scm (emacs-emms-player-mpv): Update to 0.1.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e2b901cd3a..05115bdabe 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -958,7 +958,7 @@ (define-public emms (define-public emacs-emms-player-mpv (package (name "emacs-emms-player-mpv") - (version "0.0.13") + (version "0.1.0") (source (origin (method url-fetch) @@ -967,7 +967,7 @@ (define-public emacs-emms-player-mpv (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01i0bz7wdqzcnv5r63m9xgl07yf1nmn86dwy00rcfsn5za46y3r3")))) + "05qwbagc4i7yn7i94r1hdgj6wc5xijy1pxqv08pwsmli9rqj51n9")))) (build-system emacs-build-system) (propagated-inputs `(("emms" ,emms))) -- cgit v1.2.3 From 82bead7537d395507071489979576bfc0be44f73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Apr 2018 15:21:49 +0200 Subject: gnu: Add emacs-ergoemacs-mode. * gnu/packages/emacs.scm (emacs-ergoemacs-mode): New variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 05115bdabe..d94d92f80a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7567,6 +7567,32 @@ (define-public emacs-emmet-mode used with SGML-like languages: XML, HTML, XHTML, XSL, etc.") (license license:gpl3+))) +(define-public emacs-ergoemacs-mode + (let ((commit "3ce23bba3cb50562693860f87f3528c471d603ba") + (revision "1")) + (package + (name "emacs-ergoemacs-mode") + (version (git-version "5.16.10.12" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ergoemacs/ergoemacs-mode.git") + (commit commit))) + (sha256 + (base32 + "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-undo-tree" ,emacs-undo-tree))) + (home-page "https://ergoemacs.github.io/") + (synopsis "Emacs mode based on common modern interface and ergonomics") + (description + "This package provides an efficient Emacs keybinding set based on +statistics of command frequency, and supports common shortcuts for open, +close, copy, cut, paste, undo, redo.") + (license license:gpl3+)))) + (define-public emacs-password-store (package (name "emacs-password-store") -- cgit v1.2.3 From a05a637ccc52e0057150678492c829ddc30f8163 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Mar 2018 21:13:33 -0400 Subject: gnu: emacs-idris-mode: Fix source hash. * gnu/packages/emacs.scm (emacs-idris-mode)[source]: Fix hash. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d94d92f80a..ba75b295a6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6713,7 +6713,7 @@ (define-public emacs-idris-mode version ".tar")) (sha256 (base32 - "0ld4kfwnyyhlsnj5f6cbn4is4mpxdqalk2aifkw02r00mbr9n294")))) + "02r1qqsxi6qk7q4cj6a6pygbj856dcw9vcmhfh0ib92j41v77q6y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-prop-menu" ,emacs-prop-menu))) -- cgit v1.2.3 From 30cf7070887014d337af6012816f3580e63f4504 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 9 Apr 2018 22:55:33 +0200 Subject: gnu: Add emacs-zoutline. * gnu/packages/emacs.scm (emacs-zoutline): New variable. --- gnu/packages/emacs.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ba75b295a6..79f5dac7c1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017, 2018 Kyle Meyer ;;; Copyright © 2017 Kei Kebreau @@ -3539,6 +3539,27 @@ (define-public emacs-iedit a temporary @code{keep-lines} or @code{occur}.") (license license:gpl3+))) +(define-public emacs-zoutline + (let ((commit "b3ee0f0e0b916838c2d2c249beba74ffdb8d5699") + (revision "0")) + (package + (name "emacs-zoutline") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/abo-abo/zoutline") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "0sd0017piw0dis6dhpq5dkqd3acisxqgipl7dj8gmc1vnswhdwr8")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (synopsis "Simple outline library") + (description + "This library provides helpers for outlines. Outlines allow users to +navigate code in a tree-like fashion.") + (license license:gpl3+)))) + (define-public emacs-lispy (package (name "emacs-lispy") -- cgit v1.2.3 From e8360eb8ea015cf35ae67d8071e38d7f9276667f Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 9 Apr 2018 21:31:25 +0200 Subject: gnu: emacs-lispy: Change source to recent Git commit. * gnu/packages/emacs.scm (emacs-lispy): Wrap with let, and change source to the Git repository. [propagated-inputs]: Add emacs-zoutline. --- gnu/packages/emacs.scm | 51 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 79f5dac7c1..dde9589a58 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3561,34 +3561,37 @@ (define-public emacs-zoutline (license license:gpl3+)))) (define-public emacs-lispy - (package - (name "emacs-lispy") - (version "0.26.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/abo-abo/lispy/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "15gig95cvamw5zlw99cxggd27c18b9scznjj97gvjn2zbljcaqzl")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-ace-window" ,emacs-ace-window) - ("emacs-iedit" ,emacs-iedit) - ("emacs-ivy" ,emacs-ivy) - ("emacs-hydra" ,emacs-hydra))) - (home-page "https://github.com/abo-abo/lispy") - (synopsis "Modal S-expression editing") - (description - "Due to the structure of Lisp syntax it's very rare for the programmer to -want to insert characters right before \"(\" or right after \")\". Thus + ;; Release 0.26.0 was almost 3 years ago, and there have been ~772 commits + ;; since. + (let ((commit "a7e1cf742e72199cc75aa5e1e686991ba4a23bc4") + (revision "0")) + (package + (name "emacs-lispy") + (version (git-version "0.26.0" revision commit)) + (home-page "https://github.com/abo-abo/lispy") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "0qg85gz5akayvhb5fmn1qx7s9847gry4g20xcnq8llr839lq28dl")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ace-window" ,emacs-ace-window) + ("emacs-iedit" ,emacs-iedit) + ("emacs-ivy" ,emacs-ivy) + ("emacs-hydra" ,emacs-hydra) + ("emacs-zoutline" ,emacs-zoutline))) + (synopsis "Modal S-expression editing") + (description + "Due to the structure of Lisp syntax it's very rare for the programmer +to want to insert characters right before \"(\" or right after \")\". Thus unprefixed printable characters can be used to call commands when the point is at one of these special locations. Lispy provides unprefixed keybindings for S-expression editing when point is at the beginning or end of an S-expression.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-clojure-mode (package -- cgit v1.2.3 From 28ca6b35d9b5ed89c4ec65f50b80e3b320e4354d Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 9 Apr 2018 22:03:30 +0200 Subject: gnu: Add emacs-lispyville. * gnu/packages/emacs.scm (emacs-lispyville): New variable. --- gnu/packages/emacs.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index dde9589a58..a26fbd122f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3593,6 +3593,35 @@ (define-public emacs-lispy S-expression.") (license license:gpl3+)))) +(define-public emacs-lispyville + ;; Later versions need a more recent Evil, with an evil-define-key* + ;; supporting nil for the state. + (let ((commit "b4291857ed6a49a67c4ea77522889ce51fb171ab") + (revision "0")) + (package + (name "emacs-lispyville") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/noctuid/lispyville") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "095zibzc3naknahdrnb59g9rbljy8wz9rkc7rf8avb3wxlwvxhm3")) + (file-name (git-file-name name version)))) + (propagated-inputs + `(("emacs-evil" ,emacs-evil) + ("emacs-lispy" ,emacs-lispy))) + (build-system emacs-build-system) + (synopsis "Minor mode for integrating Evil with lispy") + (description + "LispyVille's main purpose is to provide a Lisp editing environment +suited towards Evil users. It can serve as a minimal layer on top of lispy +for better integration with Evil, but it does not require the use of lispy’s +keybinding style. The provided commands allow for editing Lisp in normal +state and will work even without lispy being enabled.") + (license license:gpl3+)))) + (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") -- cgit v1.2.3 From 259ed58fef670e71013e0ed1c26f07ef4b0fa10a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 14:08:15 -0400 Subject: gnu: emacs-pdf-tools: Fix byte compilation. * gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Add emacs-set-emacs-load-path phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a26fbd122f..e96a69c3bc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1473,7 +1473,9 @@ (define-public emacs-pdf-tools ;; upgrading" that pdf-tools tries to perform. (emacs-substitute-variables "pdf-tools.el" ("pdf-tools-handle-upgrades" '())))) - (add-after 'emacs-patch-variables 'emacs-install + (add-after 'emacs-patch-variables 'emacs-set-emacs-load-path + (assoc-ref emacs:%standard-phases 'set-emacs-load-path)) + (add-after 'emacs-set-emacs-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) -- cgit v1.2.3 From d1d41db6bb7a836fd2347d965287040b6545cecf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 23:02:11 -0500 Subject: gnu: Adapt Emacs packages to use the new check phase. * gnu/packages/emacs.scm (emacs-dash, emacs-s, emacs-string-inflection, emacs-company, emacs-clojure-mode, emacs-julia-mode, emacs-elfeed, emacs-memoize, emacs-use-package, emacs-xmlgen, emacs-json-reformat, emacs-which-key, emacs-ws-butler, emacs-git-messenger, emacs-browse-at-remote, emacs-evil-quickscope)[arguments]: Add #:tests? and #:test-command arguments to use the new check phase. (emacs-json-reformat)[inputs]: Move emacs-dash and emacs-shut-up to ... [native-inputs]: here. Add ert-runner. (emacs-company)[arguments]: Refactor fix-bin-dir phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 178 ++++++++++++++++--------------------------------- 1 file changed, 56 insertions(+), 122 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e96a69c3bc..0a74c4eb32 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1515,11 +1515,8 @@ (define-public emacs-dash "1pjlkrzr8n45bnp3xs3dybvy0nz3gwamrfc7vsi1nhpkkw99ihhb")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "./run-tests.sh"))))))) + `(#:tests? #t + #:test-command '("./run-tests.sh"))) (home-page "https://github.com/magnars/dash.el") (synopsis "Modern list library for Emacs") (description "This package provides a modern list API library for Emacs.") @@ -1712,11 +1709,8 @@ (define-public emacs-s "0xbl75863pcm806zg0x1lw7qznzjq2c8320k8js7apyag8q4srvh")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "./run-tests.sh"))))))) + `(#:tests? #t + #:test-command '("./run-tests.sh"))) (home-page "https://github.com/magnars/s.el") (synopsis "Emacs string manipulation library") (description "This package provides an Emacs library for manipulating @@ -2228,11 +2222,8 @@ (define-public emacs-string-inflection (native-inputs `(("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "ert-runner"))))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/akicho8/string-inflection") (synopsis "Convert symbol names between different naming conventions") (description @@ -2548,7 +2539,7 @@ (define-public emacs-company (arguments `(#:phases (modify-phases %standard-phases - (add-before 'install 'check + (add-before 'check 'fix-bin-dir (lambda _ ;; The company-files-candidates-normal-root test looks ;; for the /bin directory, but the build environment has @@ -2556,7 +2547,9 @@ (define-public emacs-company ;; /tmp directory. (substitute* "test/files-tests.el" (("/bin/") "/tmp/")) - (zero? (system* "make" "test-batch"))))))) + #t))) + #:tests? #t + #:test-command '("make" "test-batch"))) (home-page "http://company-mode.github.io/") (synopsis "Modular text completion framework") (description @@ -3643,11 +3636,8 @@ (define-public emacs-clojure-mode ("emacs-s" ,emacs-s) ("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'check - (lambda _ - (zero? (system* "ert-runner"))))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/clojure-emacs/clojure-mode") (synopsis "Major mode for Clojure code") (description @@ -3826,14 +3816,10 @@ (define-public emacs-julia-mode "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "-batch" - "-l" "julia-mode.el" - "-l" "julia-mode-tests.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "julia-mode-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/JuliaEditorSupport/julia-emacs") (synopsis "Major mode for Julia") (description "This Emacs package provides a mode for the Julia @@ -4024,11 +4010,8 @@ (define-public emacs-elfeed "1fd1mx0q1qb9vgdzls5ppxfriyid48blg8smgjspiazp7kxakzxv")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "make" "test"))))))) + `(#:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/skeeto/elfeed") (synopsis "Atom/RSS feed reader for Emacs") (description @@ -5201,13 +5184,11 @@ (define-public emacs-memoize "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "-batch" "-l" "memoize.el" - "-l" "memoize-test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "-batch" + "-l" "memoize.el" + "-l" "memoize-test.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/skeeto/emacs-memoize") (synopsis "Emacs lisp memoization library") (description "@code{emacs-memoize} is an Emacs library for @@ -5490,16 +5471,12 @@ (define-public emacs-use-package (propagated-inputs `(("emacs-diminish" ,emacs-diminish))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "use-package-tests.el" - "-f" "ert-run-tests-batch-and-exit")) - ;; Tests fail in this release, but have been fixed in - ;; upstream commit 7956d40eed57d6c06bef36ebc174cf57d934e30d - #t))))) + ;; Tests fail in this release, but have been fixed in + ;; upstream commit 7956d40eed57d6c06bef36ebc174cf57d934e30d + `(#:tests? #f + #:test-command '("emacs" "--batch" + "-l" "use-package-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/jwiegley/use-package") (synopsis "Declaration for simplifying your .emacs") (description "The use-package macro allows you to isolate package @@ -5594,13 +5571,10 @@ (define-public emacs-xmlgen "0zay490vjby3f7455r0vydmjg7q1gwc78hilpfb0rg4gwz224z8r")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "xmlgen-test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "xmlgen-test.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/philjackson/xmlgen") (synopsis "S-expression to XML domain specific language (DSL) in Emacs Lisp") @@ -6299,32 +6273,15 @@ (define-public emacs-json-reformat "11fbq4scrgr7m0iwnzcrn2g7xvqwm2gf82sa7zy1l0nil7265p28")) (patches (search-patches "emacs-json-reformat-fix-tests.patch")))) (build-system emacs-build-system) - (propagated-inputs `(("emacs-undercover" ,emacs-undercover))) - (inputs - `(("emacs-dash" ,emacs-dash) ; for tests - ("emacs-shut-up" ,emacs-shut-up))) ; for tests + (propagated-inputs + `(("emacs-undercover" ,emacs-undercover))) + (native-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-shut-up" ,emacs-shut-up) + ("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "emacs" "--batch" "-L" "." - "-L" (string-append - (assoc-ref inputs "emacs-undercover") - "/share/emacs/site-lisp/guix.d/undercover-" - ,(package-version emacs-undercover)) - "-L" (string-append - (assoc-ref inputs "emacs-dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash)) - "-L" (string-append - (assoc-ref inputs "emacs-shut-up") - "/share/emacs/site-lisp/guix.d/shut-up-" - ,(package-version emacs-shut-up)) - "-l" "test/test-helper.el" - "-l" "test/json-reformat-test.el" - "-f" "ert-run-tests-batch-and-exit")) - #t))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/gongo/json-reformat") (synopsis "Reformatting tool for JSON") (description "@code{json-reformat} provides a reformatting tool for @@ -6500,13 +6457,10 @@ (define-public emacs-which-key (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "emacs" "--batch" "-L" "." - "-l" "which-key-tests.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "which-key-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/justbur/emacs-which-key") (synopsis "Display available key bindings in popup") (description @@ -6535,11 +6489,8 @@ (define-public emacs-ws-butler (native-inputs `(("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "ert-runner" "tests"))))))) + `(#:tests? #t + #:test-command '("ert-runner" "tests"))) (home-page "https://github.com/lewang/ws-butler") (synopsis "Trim spaces from end of lines") (description @@ -6636,17 +6587,9 @@ (define-public emacs-git-messenger (propagated-inputs `(("emacs-popup" ,emacs-popup))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda* (#:key inputs #:allow-other-keys) - (zero? (system* "emacs" "--batch" "-L" "." - "-L" (string-append - (assoc-ref inputs "emacs-popup") - "/share/emacs/site-lisp/guix.d/popup-" - ,(package-version emacs-popup)) - "-l" "test/test.el" - "-f" "ert-run-tests-batch-and-exit"))))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" "-l" "test/test.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/syohex/emacs-git-messenger") (synopsis "Popup commit message at current line") (description "@code{emacs-git-messenger} provides @@ -6806,11 +6749,8 @@ (define-public emacs-browse-at-remote (native-inputs `(("ert-runner" ,ert-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda _ - (zero? (system* "ert-runner"))))))) + `(#:tests? #t + #:test-command '("ert-runner"))) (home-page "https://github.com/rmuslimov/browse-at-remote") (synopsis "Open github/gitlab/bitbucket/stash page from Emacs") (description @@ -7239,16 +7179,10 @@ (define-public emacs-evil-quickscope (propagated-inputs `(("emacs-evil" ,emacs-evil))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'check - (lambda* (#:key inputs #:allow-other-keys) - (invoke "emacs" "--batch" "-L" - (string-append (assoc-ref inputs "emacs-evil") - "/share/emacs/site-lisp/guix.d/evil-" - ,(package-version emacs-evil)) - "-l" "evil-quickscope-tests.el" - "-f" "ert-run-tests-batch-and-exit")))))) + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "evil-quickscope-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/blorbx/evil-quickscope") (synopsis "Target highlighting for emacs evil-mode f,F,t and T commands") (description "@code{emacs-evil-quickscope} highlights targets for Evil -- cgit v1.2.3 From 9490c411f0d9a0a9476cb7b0855f5c2461c49b38 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:11:38 -0500 Subject: gnu: ert-runner: Adjust ert-runner wrapper to honor EMACSLOADPATH. * gnu/packages/emacs.scm (ert-runner): Use 'prefix instead of '= for setting the EMACSLOADPATH environment variable. Reuse the already computed EMACSLOADPATH for wrap-program. Specify the dependencies directly in the inputs field. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 97 +++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 56 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0a74c4eb32..81173947c6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6176,64 +6176,49 @@ (define-public emacs-commander ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run (define-public ert-runner - (let ((dependencies - `(("emacs-ansi" ,emacs-ansi) - ("emacs-commander" ,emacs-commander) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-s" ,emacs-s) - ("emacs-shut-up" ,emacs-shut-up)))) - (package - (name "ert-runner") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp")))) - (build-system emacs-build-system) - (inputs dependencies) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "bin/ert-runner" - (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version))) - (install-file "bin/ert-runner" (string-append out "/bin")) - (wrap-program (string-append out "/bin/ert-runner") - (list "EMACSLOADPATH" ":" '= - (append - ,(match dependencies - (((labels packages) ...) - `(map (lambda (label package version) - (string-append (assoc-ref inputs label) - "/share/emacs/site-lisp/guix.d/" - (string-drop package 6) - "-" version)) - ',labels - ',(map package-name packages) - ',(map package-version packages)))) - ;; empty element to include the default load path as - ;; determined by emacs' standard initialization - ;; procedure - (list "")))) - #t)))) - #:include (cons* "^reporters/.*\\.el$" %default-include))) - (home-page "https://github.com/rejeep/ert-runner.el") - (synopsis "Opinionated Ert testing workflow") - (description "@code{ert-runner} is a tool for Emacs projects tested + (package + (name "ert-runner") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/rejeep/ert-runner.el/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1657nck9i96a4xgl8crfqq0s8gflzp21pkkzwg6m3z5npjxklgwp")))) + (build-system emacs-build-system) + (inputs + `(("emacs-ansi" ,emacs-ansi) + ("emacs-commander" ,emacs-commander) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s) + ("emacs-shut-up" ,emacs-shut-up))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "bin/ert-runner" + (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") + (string-append "ERT_RUNNER=\"" out + "/share/emacs/site-lisp/guix.d/" + ,name "-" ,version))) + (install-file "bin/ert-runner" (string-append out "/bin")) + (wrap-program (string-append out "/bin/ert-runner") + (list "EMACSLOADPATH" ":" 'prefix + (string-split (getenv "EMACSLOADPATH") #\:))) + #t)))) + #:include (cons* "^reporters/.*\\.el$" %default-include))) + (home-page "https://github.com/rejeep/ert-runner.el") + (synopsis "Opinionated Ert testing workflow") + (description "@code{ert-runner} is a tool for Emacs projects tested using ERT. It assumes a certain test structure setup and can therefore make running tests easier.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-disable-mouse (package -- cgit v1.2.3 From 1848cdfb7d8ce9fb78ffc9f6771689ff9ff7e333 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 20 Apr 2018 01:06:37 +0530 Subject: gnu: emacs-memoize: Update to 1.1. * gnu/packages/emacs.scm (emacs-memoize): Update to 1.1. Re-indent. [source]: Switch to release tarball. [arguments]: Remove "-l" "memoize.el" from #:test-command. --- gnu/packages/emacs.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 81173947c6..5f7107ea7e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5170,30 +5170,29 @@ (define-public emacs-helm-c-yasnippet (define-public emacs-memoize (package - (name "emacs-memoize") - (version "20130421.b55eab0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/skeeto/emacs-memoize") - (commit "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75"))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "-batch" - "-l" "memoize.el" - "-l" "memoize-test.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://github.com/skeeto/emacs-memoize") - (synopsis "Emacs lisp memoization library") - (description "@code{emacs-memoize} is an Emacs library for + (name "emacs-memoize") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/skeeto/emacs-memoize/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05ijgwi4ymxx31vpjm2pn356j85cykknajn14lrzz8pn5sh0vrg4")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "memoize-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/skeeto/emacs-memoize") + (synopsis "Emacs lisp memoization library") + (description "@code{emacs-memoize} is an Emacs library for memoizing functions.") - (license license:unlicense))) + (license license:unlicense))) (define-public emacs-linum-relative (package -- cgit v1.2.3 From 652741cf28210ebdc3eaab18e8aa243f44310ba8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:01:05 -0400 Subject: gnu: emacs-deferred: Enable tests. * gnu/packages/emacs.scm (emacs-deferred)[arguments]: Add fix-makefile phase. Set #:test-command, and enable tests. [native-inputs]: Add emacs-ert-expectations, emacs-undercover and ert-runner. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5f7107ea7e..1638b9a91b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2487,7 +2487,24 @@ (define-public emacs-deferred "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h")) (file-name (string-append name "-" version)))) (build-system emacs-build-system) - ;; FIXME: Would need 'el-expectations' to actually run tests. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("\\$\\(CASK\\) exec ") "")) + #t))) + #:tests? #t + ;; FIXME: Normally we'd run the "test" target but for some reason the + ;; test-deferred target fails when run in the Guix build environment + ;; with the error: (file-error "Searching for program" "No such file or + ;; directory" "/bin/sh"). + #:test-command '("make" "test-concurrent" "test-concurrent-compiled"))) + (native-inputs + `(("emacs-ert-expectations" ,emacs-ert-expectations) + ("emacs-undercover" ,emacs-undercover) + ("ert-runner" ,ert-runner))) (synopsis "Simple asynchronous functions for Emacs Lisp") (description "The @code{deferred.el} library provides support for asynchronous tasks. -- cgit v1.2.3 From aea388cf364f5a9f05ad219500b2c83c2b47f62c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 31 Mar 2018 16:09:38 -0400 Subject: gnu: emacs-realgud: Fix autogen.sh after EMACSLOADPATH is set. * gnu/packages/emacs.scm (emacs-realgud)[arguments]: Move the fix-autogen-script phase to after the set-emacs-load-path phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1638b9a91b..62685ef91e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3316,7 +3316,7 @@ (define-public emacs-realgud `(#:tests? #t #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-autogen-script + (add-after 'set-emacs-load-path 'fix-autogen-script (lambda _ (substitute* "autogen.sh" (("./configure") "sh configure")))) -- cgit v1.2.3 From 5368e67c4e86b7459c69675d237b356d3d1f7b1a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 20 Apr 2018 13:42:58 +0530 Subject: gnu: emacs-realgud: Update to 1.4.5. * gnu/packages/emacs.scm (emacs-realgud): Update to 1.4.5. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 62685ef91e..d34883b561 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3302,7 +3302,7 @@ (define-public emacs-loc-changes (define-public emacs-realgud (package (name "emacs-realgud") - (version "1.4.4") + (version "1.4.5") (source (origin (method url-fetch) @@ -3310,7 +3310,7 @@ (define-public emacs-realgud version ".tar")) (sha256 (base32 - "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c")))) + "108wgxg7fb4byaiasgvbxv2hq7b00biq9f0mh9hy6vw4160y5w24")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From 62950ec7e9ad2e5e172cd73a5722348bf60fcc4f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 24 Mar 2018 21:37:41 -0400 Subject: gnu: Add emacs-kv. * gnu/packages/emacs.scm (emacs-kv): New variable. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d34883b561..8379d69db2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7300,6 +7300,32 @@ (define-public emacs-scratch-el formatting rules for that language.") (license license:bsd-2)))) +(define-public emacs-kv + (package + (name "emacs-kv") + (version "0.0.19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nicferrier/emacs-kv.git") + (commit "721148475bce38a70e0b678ba8aa923652e8900e"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" "-l" "kv-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/nicferrier/emacs-kv") + (synopsis "Key/Value data structures library for Emacs Lisp") + (description "@code{emacs-kv} is a collection of tools for dealing with +key/value data structures such as plists, alists and hash-tables in Emacs +Lisp.") + (license license:gpl3+))) + (define-public emacs-esxml (package (name "emacs-esxml") -- cgit v1.2.3 From 9835a71d80c57d26e041abbc6d8ca65e4e1277c6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 24 Mar 2018 23:07:18 -0400 Subject: gnu: emacs-esxml: Fix byte compilation. * gnu/packages/emacs.scm (emacs-esxml)[arguments]: Add fix-sources phase. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8379d69db2..b8aa9002cf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7340,6 +7340,28 @@ (define-public emacs-esxml (base32 "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-sources + (lambda _ + ;; See: https://github.com/tali713/esxml/pull/28. + (substitute* "css-lite.el" + ((";;; main interface") + (string-append ";;; main interface\n" + "(require 'cl-lib)")) + (("mapcan") + "cl-mapcan") + (("',\\(cl-mapcan #'process-css-rule rules\\)") + "(cl-mapcan #'process-css-rule ',rules)")) + (substitute* "esxml-form.el" + ((",esxml-form-field-defn") + "#'esxml-form-field-defn")) + ;; See: https://github.com/tali713/esxml/issues/25 + (delete-file "esxpath.el") + #t))))) + (propagated-inputs + `(("emacs-kv" ,emacs-kv))) (home-page "https://github.com/tali713/esxml/") (synopsis "SXML for EmacsLisp") (description "This is XML/XHTML done with S-Expressions in EmacsLisp. -- cgit v1.2.3 From 582c122e7b05271d534e1e3a57fac10f2963ca98 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 19 Mar 2018 21:28:42 -0400 Subject: gnu: emacs-sx: Fix byte compilation. The package would fail building when attempting to create a cache directory. This has been fixed upstream but not in a tagged release. * gnu/packages/emacs.scm (emacs-sx): Update to latest git version. Signed-off-by: Arun Isaac --- gnu/packages/emacs.scm | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b8aa9002cf..b72ea0fb3d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1738,26 +1738,31 @@ (define-public emacs-symon (license license:gpl2+))) (define-public emacs-sx - (package - (name "emacs-sx") - (version "0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/vermiculus/sx.el/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1w0xghfljqg31axcnv8gzlrd8pw25nji6idnrhflq0af9qh1dw03")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-markdown-mode" ,emacs-markdown-mode))) - (home-page "https://github.com/vermiculus/sx.el/") - (synopsis "Emacs StackExchange client") - (description - "Emacs StackExchange client. Ask and answer questions on + (let ((version "20180212") + (revision "1") + (commit "833435fbf90d1c9e927d165b155f3b1ef39271de")) + (package + (name "emacs-sx") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vermiculus/sx.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-markdown-mode" ,emacs-markdown-mode))) + (home-page "https://github.com/vermiculus/sx.el") + (synopsis "Emacs StackExchange client") + (description + "Emacs StackExchange client. Ask and answer questions on Stack Overflow, Super User, and other StackExchange sites.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-f (package -- cgit v1.2.3 From 1af4212ae4bf357b691896984561d8b09544784e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 20 Apr 2018 12:31:28 +0200 Subject: gnu: emacs-org, emacs-org-contrib: Update version. * gnu/packages/emacs.scm (emacs-org): Update to 9.1.10. (emacs-org-contrib): Update to 20180416. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b72ea0fb3d..b2fd069d3a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4618,14 +4618,14 @@ (define-public emacs-org (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.1.9") + (version "9.1.10") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "16yr0srfzsrzv2b1f2wjk8gb2pyhsgj2hxbscixirkxqz674c5cl")))) + "01vvq6m7r2ifyflvq5ga241qvl4j62smz0zr6jljk56b6nqi20lm")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") @@ -4639,14 +4639,14 @@ (define-public emacs-org-contrib (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20180327") + (version "20180416") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-" version ".tar")) (sha256 (base32 - "1y1nn0bxnh9y4a3zrqng8n639j5da5387q2314sr3a8ggy1nb93s")))) + "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) -- cgit v1.2.3