gnu: Adjust to removing ed.scm and nano.scm

This is a follow-up to f6817e71dff7d0d9fdb55db8b85a1d3d04e2bf5a and
e11e65a9ad08e18ea2faac3c9f4639a7b189bf76.

* gnu/installer.scm, gnu/packages/algebra.scm, gnu/packages/base.scm,
gnu/packages/cook.scm, gnu/packages/lisp.scm,
gnu/packages/patchutils.scm, gnu/packages/version-control.scm,
gnu/packages/web-browsers.scm, gnu/system.scm: Adjust module imports.

Change-Id: I25e5519fa003c35a14b81c3dda37b24527858634

9 files changed, 8 insertions, 10 deletions

diff --git a/gnu/installer.scm b/gnu/installer.scm
index db79c11530..3b06b4f01b 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -45,10 +45,10 @@
   #:autoload   (gnu packages gnupg) (guile-gcrypt)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages nano)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xorg)
   #:use-module (gnu system locale)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index c454c69164..f319e260e9 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -41,7 +41,6 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages gcc)
@@ -63,6 +62,7 @@
   #:use-module (gnu packages shells)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index ea6fdc3b88..8b25af6a5e 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -48,7 +48,6 @@
   #:use-module (gnu packages attr)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages multiprecision)
@@ -57,6 +56,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages hurd)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm
index 584f561ceb..f2bd4d8c1f 100644
--- a/gnu/packages/cook.scm
+++ b/gnu/packages/cook.scm
@@ -22,10 +22,10 @@
   #:use-module (guix packages)
   #:use-module (guix licenses)
   #:use-module (guix download)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages groff)
+  #:use-module (gnu packages text-editors)
   #:use-module (guix build-system gnu))
 
 (define-public cook
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 0f1520a2a5..afd50bf46a 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -67,7 +67,6 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages dbm)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
@@ -95,6 +94,7 @@
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages xorg)
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index efb9a04aee..3d7ffdcd88 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -38,7 +38,6 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
@@ -55,6 +54,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages less)
   #:use-module (gnu packages mail)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ocaml)
   #:use-module (gnu packages package-management)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 2c79ceb294..013504875b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -97,7 +97,6 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages docbook)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
@@ -117,7 +116,6 @@
   #:use-module (gnu packages mail)
   #:use-module (gnu packages man)
   #:use-module (gnu packages maths)
-  #:use-module (gnu packages nano)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages web)
@@ -137,6 +135,7 @@
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages emacs)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 141917ad42..0d749dcd30 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -83,7 +83,6 @@
   #:use-module (gnu packages man)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages mp3)
-  #:use-module (gnu packages nano)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -96,6 +95,7 @@
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tcl)
+  #:use-module (gnu packages text-editors)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xorg))
diff --git a/gnu/system.scm b/gnu/system.scm
index 279b9df5c0..cfa036556d 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -59,7 +59,6 @@
   #:use-module (gnu packages less)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages man)
-  #:use-module (gnu packages nano)
   #:use-module (gnu packages nvi)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages pciutils)