diff options
Diffstat (limited to 'gnu/packages/emacs-xyz.scm')
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 190 |
1 files changed, 46 insertions, 144 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index acd690fee5..7ded5ba7e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; ;;; This file is part of GNU Guix. ;;; @@ -295,7 +296,7 @@ on stdout instead of using a socket as the Emacsclient does.") (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) (package (name "emacs-magit") - (version (git-version "2.90.1" "2" commit)) + (version (git-version "2.90.1" "3" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -335,24 +336,10 @@ on stdout instead of using a socket as the Emacsclient does.") (guix build emacs-utils)) #:test-target "test" #:tests? #f ; tests are not included in the release - #:make-flags (list (string-append "PREFIX=" %output) ;; Don't put .el files in a sub-directory. - (string-append "lispdir=" %output "/share/emacs/site-lisp") - (string-append "DASH_DIR=" - (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "WITH_EDITOR_DIR=" - (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor)) - (string-append "TRANSIENT_DIR=" - (assoc-ref %build-inputs "transient") - "/share/emacs/site-lisp/guix.d/transient-" - ,(package-version emacs-transient))) - + (string-append "lispdir=" %output "/share/emacs/site-lisp")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch @@ -414,7 +401,7 @@ operations.") (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) (package (name "emacs-magit-svn") - (version (git-version "2.2.1" "1" commit)) + (version (git-version "2.2.1" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -424,48 +411,11 @@ operations.") (sha256 (base32 "1mlqz8dh6jy5rv72lgkxv253dgh73fmbaidskicypapvbl3lr6xy")))) - (build-system trivial-build-system) - (native-inputs `(("emacs" ,emacs-minimal))) + (build-system emacs-build-system) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor) ("magit" ,emacs-magit) ("transient" ,emacs-transient))) - (arguments - `(#:modules ((guix build utils) - (guix build emacs-utils)) - - #:builder - (begin - (use-modules (guix build utils) - (guix build emacs-utils)) - - (let ((emacs (string-append (assoc-ref %build-inputs "emacs") - "/bin/emacs")) - (magit (string-append (assoc-ref %build-inputs "magit") - "/share/emacs/site-lisp")) - (transient (string-append (assoc-ref %build-inputs "transient") - "/share/emacs/site-lisp/guix.d/transient-" - ,(package-version emacs-transient))) - (dash (string-append (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash))) - (with-editor (string-append (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor))) - (source (assoc-ref %build-inputs "source")) - (lisp-dir (string-append %output "/share/emacs/site-lisp"))) - - (install-file (string-append source "/magit-svn.el") - lisp-dir) - - (with-directory-excursion lisp-dir - (parameterize ((%emacs emacs)) - (emacs-generate-autoloads ,name lisp-dir) - (setenv "EMACSLOADPATH" - (string-append ":" magit ":" transient - ":" dash ":" with-editor)) - (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) - #t)))) (home-page "https://github.com/magit/magit-svn") (synopsis "Git-SVN extension to Magit") (description @@ -2164,47 +2114,6 @@ type, for example: packages, buffers, files, etc.") (base32 "0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - (let ((guix (assoc-ref %build-inputs "guix")) - (gcrypt (assoc-ref %build-inputs "guile-gcrypt")) - (geiser (assoc-ref %build-inputs "geiser")) - (dash (assoc-ref %build-inputs "dash")) - (bui (assoc-ref %build-inputs "bui")) - (magit-popup (assoc-ref %build-inputs "magit-popup")) - (edit-indirect (assoc-ref %build-inputs "edit-indirect")) - (site-lisp "/share/emacs/site-lisp") - (site-scm "/share/guile/site") - (site-go "/lib/guile") - (guile-dir (lambda (dir) - (car (find-files dir - (lambda (file stat) - (string-prefix? - "2." (basename file))) - #:directories? #t))))) - (list (string-append "--with-guix-site-dir=" - (guile-dir (string-append guix site-scm))) - (string-append "--with-guix-site-ccache-dir=" - (guile-dir (string-append guix site-go)) - "/site-ccache") - (string-append "--with-guile-gcrypt-site-dir=" - (guile-dir (string-append gcrypt site-scm))) - (string-append "--with-guile-gcrypt-site-ccache-dir=" - (guile-dir (string-append gcrypt site-go)) - "/site-ccache") - (string-append "--with-geiser-lispdir=" geiser site-lisp) - (string-append "--with-dash-lispdir=" - dash site-lisp "/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "--with-bui-lispdir=" - bui site-lisp "/guix.d/bui-" - ,(package-version emacs-bui)) - (string-append "--with-editindirect-lispdir=" - edit-indirect site-lisp "/guix.d/edit-indirect-" - ,(package-version emacs-edit-indirect)) - (string-append "--with-popup-lispdir=" - magit-popup site-lisp "/guix.d/magit-popup-" - ,(package-version emacs-magit-popup)))))) (native-inputs `(("pkg-config" ,pkg-config) ("emacs" ,emacs-minimal))) @@ -3725,7 +3634,7 @@ build jobs.") (define-public emacs-company (package (name "emacs-company") - (version "0.9.11") + (version "0.9.12") (source (origin (method git-fetch) @@ -3734,7 +3643,7 @@ build jobs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i")))) + (base32 "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a")))) (build-system emacs-build-system) (arguments `(#:phases @@ -3750,7 +3659,7 @@ build jobs.") #t))) #:tests? #t #:test-command '("make" "test-batch"))) - (home-page "http://company-mode.github.io/") + (home-page "https://company-mode.github.io/") (synopsis "Modular text completion framework") (description "Company is a modular completion mechanism. Modules for retrieving @@ -4346,7 +4255,7 @@ for @code{AUCTeX}.") (substitute* "mit-scheme-doc.el" (("http://www\\.gnu\\.org/software/mit-scheme/documentation/mit-scheme-ref/") (string-append "file:" doc-dir "/mit-scheme-ref/"))))))))) - (home-page "http://groups.csail.mit.edu/mac/users/gjs/6.945/dont-panic/") + (home-page "https://groups.csail.mit.edu/mac/users/gjs/6.945/dont-panic/") (synopsis "MIT-Scheme documentation lookup for Emacs") (description "This package provides a set of Emacs functions to search definitions of @@ -6486,7 +6395,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (define-public emacs-projectile (package (name "emacs-projectile") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -6494,7 +6403,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "149hablms6n9b4wp78dz4pjz1rzyylfw9ayghq5p9d7k661mvyby")))) + "1jj9wk91clyph3zmxkd7y7d6gdqmjd1vndhyq5fxp7i7dy013571")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) @@ -12707,7 +12616,7 @@ files to be expanded upon opening them.") (build-system emacs-build-system) (propagated-inputs `(("emacs-parsebib" ,emacs-parsebib))) - (home-page "http://joostkremers.github.io/ebib/") + (home-page "https://joostkremers.github.io/ebib/") (synopsis "BibTeX database manager for Emacs") (description "Ebib is a BibTeX database manager that runs in GNU Emacs. @@ -18378,7 +18287,7 @@ a suffix) we prefer to call it just a \"transient\".") (let ((commit "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb")) (package (name "emacs-forge") - (version (git-version "0.1.0" "2" commit)) + (version (git-version "0.1.0" "3" commit)) (source (origin (method git-fetch) @@ -18389,7 +18298,7 @@ a suffix) we prefer to call it just a \"transient\".") (sha256 (base32 "1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83")))) - (build-system gnu-build-system) + (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) @@ -18404,51 +18313,22 @@ a suffix) we prefer to call it just a \"transient\".") ("emacs-transient" ,emacs-transient))) (arguments `(#:tests? #f ;no tests - #:modules ((srfi srfi-26) - (guix build gnu-build-system) - ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'install) - (add-after 'unpack 'delete-doc-targets + (add-after 'unpack 'build-info-manual (lambda _ - (substitute* "./Makefile" - (("lisp docs") "lisp")))) - (add-after 'delete-doc-targets 'chdir-lisp + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/forge.info" "lisp/forge.info"))) + (add-after 'build-info-manual 'chdir-lisp (lambda _ - (chdir "lisp"))) - (add-after 'chdir-lisp 'emacs-install - (assoc-ref emacs:%standard-phases 'install)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads)) - (add-after 'build 'install-elc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (el-dir (string-append - out "/share/emacs/site-lisp/guix.d/forge-" - ,version))) - (for-each (cut install-file <> el-dir) - (find-files "." "\\.elc")) - #t))) - (add-after 'install-elc 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (with-directory-excursion "../docs" - (invoke "makeinfo" "forge.texi") - (install-file "forge.info" info) - #t))))))) + (chdir "lisp") + #t))))) (home-page "https://github.com/magit/forge/") (synopsis "Access Git forges from Magit") - (description - "Work with Git forges, such as Github and Gitlab, from the comfort of -Magit and the rest of Emacs.") + (description "Work with Git forges, such as Github and Gitlab, from the +comfort of Magit and the rest of Emacs.") (license license:gpl3+)))) (define-public emacs-matcha @@ -21829,3 +21709,25 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.") "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji conversion program}, a Japanese input method on Emacs.") (license license:gpl2+)))) + +(define-public emacs-objed + (package + (name "emacs-objed") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/objed-" version ".tar")) + (sha256 + (base32 + "1s38d6bvggdk5p45ww1jb4gxifzgjwgw1m6ar920nlg0j4fgbcvr")))) + (build-system emacs-build-system) + (home-page "https://github.com/clemera/objed") + (synopsis "Navigate and edit text objects") + (description + "@code{emacs-objed} allows to navigate and edit text objects. It +enables modal editing and composition of commands, too. It combines ideas of +other Editors like Vim or Kakoune and tries to align them with regular Emacs +conventions.") + (license license:gpl3+))) |