gnu: Prefix all Emacs packages with "emacs-".

* gnu/packages/emacs.scm: Prefix all Emacs packages with "emacs-".
This is to enforce consistency and so that `emacs-packages?' can reliably
detect Emacs packages based on the "emacs-" prefix.
This commit is contained in:
Pierre Neidhardt 2018-09-17 18:31:33 +02:00
parent cd8aa06093
commit 5c8031ff73
No known key found for this signature in database
GPG Key ID: 9BDCF497A4BBCC7F
1 changed files with 79 additions and 40 deletions

View File

@ -335,9 +335,9 @@ editor (without an X toolkit)" )
;;; Emacs hacking. ;;; Emacs hacking.
;;; ;;;
(define-public geiser (define-public emacs-geiser
(package (package
(name "geiser") (name "emacs-geiser")
(version "0.10") (version "0.10")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -370,7 +370,10 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live
metadata.") metadata.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public paredit (define-public geiser
(deprecated-package "geiser" emacs-geiser))
(define-public emacs-paredit
(package (package
(name "emacs-paredit") (name "emacs-paredit")
(version "24") (version "24")
@ -395,6 +398,9 @@ for those who may want transient periods of unbalanced parentheses, such as
when typing parentheses directly or commenting out code line by line.") when typing parentheses directly or commenting out code line by line.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public paredit
(deprecated-package "paredit" emacs-paredit))
(define-public git-modes (define-public git-modes
(package (package
(name "emacs-git-modes") (name "emacs-git-modes")
@ -444,9 +450,9 @@ For remote processes a substitute is provided, which communicates with Emacs
on stdout instead of using a socket as the Emacsclient does.") on stdout instead of using a socket as the Emacsclient does.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public magit (define-public emacs-magit
(package (package
(name "magit") (name "emacs-magit")
(version "2.13.0") (version "2.13.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -512,9 +518,12 @@ cherry picking, reverting, merging, rebasing, and other common Git
operations.") operations.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public magit-svn (define-public magit
(deprecated-package "magit" emacs-magit))
(define-public emacs-magit-svn
(package (package
(name "magit-svn") (name "emacs-magit-svn")
(version "2.2.0") (version "2.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -531,7 +540,7 @@ operations.")
("gzip" ,gzip))) ("gzip" ,gzip)))
(propagated-inputs `(("dash" ,emacs-dash) (propagated-inputs `(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor) ("with-editor" ,emacs-with-editor)
("magit" ,magit))) ("magit" ,emacs-magit)))
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
@ -577,6 +586,9 @@ operations.")
support for Git-SVN.") support for Git-SVN.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public magit-svn
(deprecated-package "magit-svn" emacs-magit-svn))
(define-public emacs-magit-popup (define-public emacs-magit-popup
(package (package
(name "emacs-magit-popup") (name "emacs-magit-popup")
@ -641,9 +653,9 @@ Gitlab APIs from Emacs packages. It abstracts access to API resources using
only a handful of functions that are not resource-specific.") only a handful of functions that are not resource-specific.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public haskell-mode (define-public emacs-haskell-mode
(package (package
(name "haskell-mode") (name "emacs-haskell-mode")
(version "16.1") (version "16.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -731,7 +743,10 @@ only a handful of functions that are not resource-specific.")
programs.") programs.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public flycheck (define-public haskell-mode
(deprecated-package "haskell-mode" emacs-haskell-mode))
(define-public emacs-flycheck
(package (package
(name "emacs-flycheck") (name "emacs-flycheck")
(version "31") (version "31")
@ -767,6 +782,9 @@ different tools. It highlights errors and warnings inline in the buffer, and
provides an optional IDE-like error list.") provides an optional IDE-like error list.")
(license license:gpl3+))) ;+GFDLv1.3+ for the manual (license license:gpl3+))) ;+GFDLv1.3+ for the manual
(define-public flycheck
(deprecated-package "flycheck" emacs-flycheck))
;;; ;;;
;;; Web browsing. ;;; Web browsing.
@ -910,7 +928,7 @@ provides an optional IDE-like error list.")
;;; Multimedia. ;;; Multimedia.
;;; ;;;
(define-public emms (define-public emacs-emms
(package (package
(name "emacs-emms") (name "emacs-emms")
(version "5.0") (version "5.0")
@ -1048,9 +1066,12 @@ light user interface.")
(home-page "https://www.gnu.org/software/emms/") (home-page "https://www.gnu.org/software/emms/")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emms
(deprecated-package "emacs-emms" emacs-emms))
(define-public emacs-emms-player-mpv (define-public emacs-emms-player-mpv
;; A new mpv backend is included in Emms from 5.0. ;; A new mpv backend is included in Emms from 5.0.
(deprecated-package "emacs-emms-player-mpv" emms)) (deprecated-package "emacs-emms-player-mpv" emacs-emms))
(define-public emacs-emms-mode-line-cycle (define-public emacs-emms-mode-line-cycle
(package (package
@ -1080,9 +1101,9 @@ within a specified width. It is useful for displaying long track titles.")
;;; Miscellaneous. ;;; Miscellaneous.
;;; ;;;
(define-public bbdb (define-public emacs-bbdb
(package (package
(name "bbdb") (name "emacs-bbdb")
(version "3.1.2") (version "3.1.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -1121,6 +1142,9 @@ like. It can be linked with various Emacs mail clients (Message and Mail
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public bbdb
(deprecated-package "bbdb" emacs-bbdb))
(define-public emacs-aggressive-indent (define-public emacs-aggressive-indent
(package (package
(name "emacs-aggressive-indent") (name "emacs-aggressive-indent")
@ -1721,7 +1745,7 @@ type, for example: packages, buffers, files, etc.")
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
("guix" ,guix))) ("guix" ,guix)))
(propagated-inputs (propagated-inputs
`(("geiser" ,geiser) `(("geiser" ,emacs-geiser)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile-gcrypt)
("dash" ,emacs-dash) ("dash" ,emacs-dash)
("bui" ,emacs-bui) ("bui" ,emacs-bui)
@ -2377,7 +2401,7 @@ in Lisp modes.")
"1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k")))) "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs (native-inputs
`(("ert-runner" ,ert-runner))) `(("ert-runner" ,emacs-ert-runner)))
(arguments (arguments
`(#:tests? #t `(#:tests? #t
#:test-command '("ert-runner"))) #:test-command '("ert-runner")))
@ -2663,7 +2687,7 @@ framework for Emacs Lisp to be used with @code{ert}.")
(native-inputs (native-inputs
`(("emacs-ert-expectations" ,emacs-ert-expectations) `(("emacs-ert-expectations" ,emacs-ert-expectations)
("emacs-undercover" ,emacs-undercover) ("emacs-undercover" ,emacs-undercover)
("ert-runner" ,ert-runner))) ("ert-runner" ,emacs-ert-runner)))
(synopsis "Simple asynchronous functions for Emacs Lisp") (synopsis "Simple asynchronous functions for Emacs Lisp")
(description (description
"The @code{deferred.el} library provides support for asynchronous tasks. "The @code{deferred.el} library provides support for asynchronous tasks.
@ -2672,7 +2696,7 @@ The API is almost the same as that of
for asynchronous tasks.") for asynchronous tasks.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public butler (define-public emacs-butler
(package (package
(name "emacs-butler") (name "emacs-butler")
(version "0.2.4") (version "0.2.4")
@ -2698,6 +2722,9 @@ view the build status of those servers' build jobs, and possibly to trigger
build jobs.") build jobs.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public butler
(deprecated-package "emacs-butler" emacs-butler))
(define-public emacs-company (define-public emacs-company
(package (package
(name "emacs-company") (name "emacs-company")
@ -2823,7 +2850,7 @@ completion candidate when using the Company text completion framework.")
simultaneous cursors.") simultaneous cursors.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public typo (define-public emacs-typo
(package (package
(name "emacs-typo") (name "emacs-typo")
(version "1.1") (version "1.1")
@ -2847,6 +2874,9 @@ automatically inserts a Unicode opening or closing quotation mark, depending
on context.") on context.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public typo
(deprecated-package "emacs-typo" emacs-typo))
(define-public emacs-scheme-complete (define-public emacs-scheme-complete
(let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5"))
(package (package
@ -3982,7 +4012,7 @@ state and will work even without lispy being enabled.")
(native-inputs (native-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-s" ,emacs-s) ("emacs-s" ,emacs-s)
("ert-runner" ,ert-runner))) ("ert-runner" ,emacs-ert-runner)))
(arguments (arguments
`(#:tests? #t `(#:tests? #t
#:test-command '("ert-runner"))) #:test-command '("ert-runner")))
@ -4354,7 +4384,7 @@ indentation and filling of comments and C preprocessor fontification.")
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-s" ,emacs-s) ("emacs-s" ,emacs-s)
("emacs-flycheck" ,flycheck) ("emacs-flycheck" ,emacs-flycheck)
("emacs-typescript-mode" ,emacs-typescript-mode))) ("emacs-typescript-mode" ,emacs-typescript-mode)))
(home-page "https://github.com/ananthakumaran/tide") (home-page "https://github.com/ananthakumaran/tide")
(synopsis "Typescript IDE for Emacs") (synopsis "Typescript IDE for Emacs")
@ -4519,7 +4549,7 @@ provide the historic behavior of @code{flet}, as well as
`(#:tests? #t `(#:tests? #t
#:test-command '("ert-runner"))) #:test-command '("ert-runner")))
(native-inputs (native-inputs
`(("ert-runner" ,ert-runner))) `(("ert-runner" ,emacs-ert-runner)))
(propagated-inputs (propagated-inputs
`(("emacs-el-x" ,emacs-el-x))) `(("emacs-el-x" ,emacs-el-x)))
(home-page "https://github.com/sigma/mocker.el") (home-page "https://github.com/sigma/mocker.el")
@ -4585,7 +4615,7 @@ functions to assist in reviewing changes on files.")
#:tests? #t #:tests? #t
#:test-command '("ert-runner"))) #:test-command '("ert-runner")))
(native-inputs (native-inputs
`(("ert-runner" ,ert-runner) `(("ert-runner" ,emacs-ert-runner)
("emacs-mocker" ,emacs-mocker))) ("emacs-mocker" ,emacs-mocker)))
(home-page "https://github.com/jorgenschaefer/pyvenv") (home-page "https://github.com/jorgenschaefer/pyvenv")
(synopsis "Virtualenv minor mode for Emacs") (synopsis "Virtualenv minor mode for Emacs")
@ -4670,7 +4700,7 @@ indentation (space indentation only).
("pyvenv" ,emacs-pyvenv) ("pyvenv" ,emacs-pyvenv)
("s" ,emacs-s))) ("s" ,emacs-s)))
(native-inputs (native-inputs
`(("ert-runner" ,ert-runner) `(("ert-runner" ,emacs-ert-runner)
("emacs-f" ,emacs-f) ("emacs-f" ,emacs-f)
("python" ,python-wrapper) ("python" ,python-wrapper)
("python-autopep8" ,python-autopep8) ("python-autopep8" ,python-autopep8)
@ -6932,9 +6962,9 @@ Emacs.")
;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; Tests for ert-runner have a circular dependency with ecukes, and therefore
;; cannot be run ;; cannot be run
(define-public ert-runner (define-public emacs-ert-runner
(package (package
(name "ert-runner") (name "emacs-ert-runner")
(version "0.7.0") (version "0.7.0")
(source (source
(origin (origin
@ -6977,6 +7007,9 @@ using ERT. It assumes a certain test structure setup and can therefore make
running tests easier.") running tests easier.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public ert-runner
(deprecated-package "ert-runner" emacs-ert-runner))
(define-public emacs-disable-mouse (define-public emacs-disable-mouse
(package (package
(name "emacs-disable-mouse") (name "emacs-disable-mouse")
@ -7020,7 +7053,7 @@ running a customisable handler command (@code{ignore} by default). ")
(native-inputs (native-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-shut-up" ,emacs-shut-up) ("emacs-shut-up" ,emacs-shut-up)
("ert-runner" ,ert-runner))) ("ert-runner" ,emacs-ert-runner)))
(arguments (arguments
`(#:tests? #t `(#:tests? #t
#:test-command '("ert-runner"))) #:test-command '("ert-runner")))
@ -7251,7 +7284,7 @@ settings).")
"1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb")))) "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(native-inputs (native-inputs
`(("ert-runner" ,ert-runner))) `(("ert-runner" ,emacs-ert-runner)))
(arguments (arguments
`(#:tests? #t `(#:tests? #t
#:test-command '("ert-runner" "tests"))) #:test-command '("ert-runner" "tests")))
@ -7507,7 +7540,7 @@ Idris.")
`(("emacs-f" ,emacs-f) `(("emacs-f" ,emacs-f)
("emacs-s" ,emacs-s))) ("emacs-s" ,emacs-s)))
(native-inputs (native-inputs
`(("ert-runner" ,ert-runner))) `(("ert-runner" ,emacs-ert-runner)))
(arguments (arguments
`(#:tests? #t `(#:tests? #t
#:test-command '("ert-runner"))) #:test-command '("ert-runner")))
@ -7977,9 +8010,9 @@ supports multiple backends such as @code{vlc}, @code{mpg123},
@code{afplay}.") @code{afplay}.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public groovy-emacs-modes (define-public emacs-groovy-modes
(package (package
(name "groovy-emacs-modes") (name "emacs-groovy-modes")
(version "2.0") (version "2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -8001,7 +8034,10 @@ Groovy source files, REPL integration with run-groovy and Grails project
navigation with the grails mode.") navigation with the grails mode.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public org-tree-slide (define-public groovy-emacs-modes
(deprecated-package "groovy-emacs-modes" emacs-groovy-modes))
(define-public emacs-org-tree-slide
(let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134") (let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134")
(revision "0")) (revision "0"))
(package (package
@ -8023,6 +8059,9 @@ navigation with the grails mode.")
@kbd{C-<} to jump to the next and previous slide.") @kbd{C-<} to jump to the next and previous slide.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public org-tree-slide
(deprecated-package "emacs-org-tree-slide" emacs-org-tree-slide))
(define-public emacs-scratch-el (define-public emacs-scratch-el
(let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897")
(revision "1")) (revision "1"))
@ -10095,7 +10134,7 @@ time is being spent during Emacs startup in order to optimize startup time.")
(define-public emacs-emms-player-simple-mpv (define-public emacs-emms-player-simple-mpv
;; A new mpv backend is included in Emms from 5.0. ;; A new mpv backend is included in Emms from 5.0.
(deprecated-package "emacs-emms-player-simple-mpv" emms)) (deprecated-package "emacs-emms-player-simple-mpv" emacs-emms))
(define-public emacs-magit-org-todos-el (define-public emacs-magit-org-todos-el
(let ((commit "df206287737b9671f2e36ae7b1474ebbe9940d2a")) (let ((commit "df206287737b9671f2e36ae7b1474ebbe9940d2a"))
@ -10113,7 +10152,7 @@ time is being spent during Emacs startup in order to optimize startup time.")
(base32 (base32
"0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn")))) "0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn"))))
(propagated-inputs (propagated-inputs
`(("magit" ,magit))) `(("magit" ,emacs-magit)))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/danielma/magit-org-todos.el") (home-page "https://github.com/danielma/magit-org-todos.el")
(synopsis "Get todo.org into Emacs Magit status") (synopsis "Get todo.org into Emacs Magit status")
@ -10952,7 +10991,7 @@ through the symbol: @command{this-fn}.")
`(("emacs-el-mock" ,emacs-el-mock) `(("emacs-el-mock" ,emacs-el-mock)
("emacs-noflet" ,emacs-noflet) ("emacs-noflet" ,emacs-noflet)
("emacs-undercover" ,emacs-undercover) ("emacs-undercover" ,emacs-undercover)
("ert-runner" ,ert-runner))) ("ert-runner" ,emacs-ert-runner)))
(propagated-inputs (propagated-inputs
`(("emacs-f" ,emacs-f) `(("emacs-f" ,emacs-f)
("emacs-popup" ,emacs-popup))) ("emacs-popup" ,emacs-popup)))
@ -11139,7 +11178,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-evil" ,emacs-evil) `(("emacs-evil" ,emacs-evil)
("magit" ,magit))) ("magit" ,emacs-magit)))
(home-page (home-page
"https://github.com/emacs-evil/evil-magit") "https://github.com/emacs-evil/evil-magit")
(synopsis "Evil-based key bindings for Magit") (synopsis "Evil-based key bindings for Magit")
@ -11412,7 +11451,7 @@ you searched for and execute it, or view its documentation.")
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-helm" ,emacs-helm) `(("emacs-helm" ,emacs-helm)
("emacs-emms" ,emms))) ("emacs-emms" ,emacs-emms)))
(home-page (home-page
"https://github.com/emacs-helm/helm-emms") "https://github.com/emacs-helm/helm-emms")
(synopsis "Emms for Helm") (synopsis "Emms for Helm")
@ -11467,7 +11506,7 @@ See @code{helm-exwm-switch-browser} for an example.")
(build-system emacs-build-system) (build-system emacs-build-system)
(propagated-inputs (propagated-inputs
`(("emacs-dash" ,emacs-dash) `(("emacs-dash" ,emacs-dash)
("emacs-flycheck" ,flycheck) ("emacs-flycheck" ,emacs-flycheck)
("emacs-helm" ,emacs-helm))) ("emacs-helm" ,emacs-helm)))
(home-page "https://github.com/yasuyk/helm-flycheck") (home-page "https://github.com/yasuyk/helm-flycheck")
(synopsis "Show Flycheck errors with Helm") (synopsis "Show Flycheck errors with Helm")
@ -12029,7 +12068,7 @@ buffers other modes on the TODO list).
("emacs-dash" ,emacs-dash) ("emacs-dash" ,emacs-dash)
("emacs-f" ,emacs-f) ("emacs-f" ,emacs-f)
("emacs-hl-todo" ,emacs-hl-todo) ("emacs-hl-todo" ,emacs-hl-todo)
("magit" ,magit) ("magit" ,emacs-magit)
("emacs-pcre2el" ,emacs-pcre2el) ("emacs-pcre2el" ,emacs-pcre2el)
("emacs-s" ,emacs-s))) ("emacs-s" ,emacs-s)))
(home-page "https://github.com/alphapapa/magit-todos") (home-page "https://github.com/alphapapa/magit-todos")