summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-21 23:07:33 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-21 23:10:07 +0100
commitf896abc71f7ed3de72df1c9af7477ee59737f768 (patch)
tree483fc134653c1f68cf0759aa194993e561f26c6b
parentf61e6e5238ff43b959c258ed92531029a1c82fa7 (diff)
downloadpatches-f896abc71f7ed3de72df1c9af7477ee59737f768.tar
patches-f896abc71f7ed3de72df1c9af7477ee59737f768.tar.gz
gnu: emacs-nix-mode: Move to emacs-xyz.scm.
This removes emacs-xyz.scm from the closure of (gnu packages base). * gnu/packages/package-management.scm (emacs-nix-mode): Move back to... * gnu/packages/emacs-xyz.scm (emacs-nix-mode): ... here. New variable.
-rw-r--r--gnu/packages/emacs-xyz.scm24
-rw-r--r--gnu/packages/package-management.scm26
2 files changed, 24 insertions, 26 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e90c3b3e29..cb84a87a95 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12867,3 +12867,27 @@ DBI, and provides DB-accessing API and the simple management UI.")
(description "This package is a convenience wrapper for @command{edbi}
to open SQLite databases.")
(license license:gpl3+))))
+
+(define-public emacs-nix-mode
+ (package
+ (name "emacs-nix-mode")
+ (version "1.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/NixOS/nix-mode/archive/v"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z"))))
+ (build-system emacs-build-system)
+ (inputs
+ `(("emacs-company" ,emacs-company)
+ ("emacs-mmm-mode" ,emacs-mmm-mode)))
+ (home-page "https://github.com/NixOS/nix-mode")
+ (synopsis "Emacs major mode for editing Nix expressions")
+ (description "@code{nixos-mode} provides an Emacs major mode for editing
+Nix expressions. It supports syntax highlighting, indenting and refilling of
+comments.")
+ (license license:lgpl2.1+)))
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 05da8190b6..66712da08c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -43,7 +43,6 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages dbm)
#:use-module (gnu packages docbook)
- #:use-module (gnu packages emacs-xyz)
#:use-module (gnu packages file)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
@@ -76,7 +75,6 @@
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
- #:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
@@ -460,30 +458,6 @@ store, usually the directory /nix/store, where each package has its own unique
sub-directory.")
(license license:lgpl2.1+)))
-(define-public emacs-nix-mode
- (package
- (name "emacs-nix-mode")
- (version "1.2.2")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/NixOS/nix-mode/archive/v"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "06aqz0czznsj8835jqnk794sy2p6pa8kxfqwh0nl5d5vxivria6z"))))
- (build-system emacs-build-system)
- (inputs
- `(("emacs-company" ,emacs-company)
- ("emacs-mmm-mode" ,emacs-mmm-mode)))
- (home-page "https://github.com/NixOS/nix-mode")
- (synopsis "Emacs major mode for editing Nix expressions")
- (description "@code{nixos-mode} provides an Emacs major mode for editing
-Nix expressions. It supports syntax highlighting, indenting and refilling of
-comments.")
- (license license:lgpl2.1+)))
-
(define-public stow
(package
(name "stow")