summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-15 15:03:55 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-15 17:41:54 +0200
commit4a3bcaee5a5eca89d73f08154dc3d4501febd7ef (patch)
tree5b73fe755a58ebf023c3677d1739653c54dbcd29
parent00f4bd509fd7c7bf83b803f36293824bd26ff28f (diff)
services: Remove lsh service from %DESKTOP-SERVICES.
Suggested by Mark H Weaver and others at <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00227.html>. * gnu/services/desktop.scm (%desktop-services): Remove call to 'lsh-service'. * doc/guix.texi (Desktop Services): Adjust accordingly.
-rw-r--r--doc/guix.texi2
-rw-r--r--gnu/services/desktop.scm2
2 files changed, 1 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 46dccb8e2b1..f707b5c58f9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5475,7 +5475,7 @@ adds or adjust services for a typical ``desktop'' setup.
5475In particular, it adds a graphical login manager (@pxref{X Window, 5475In particular, it adds a graphical login manager (@pxref{X Window,
5476@code{slim-service}}), a network management tool (@pxref{Networking 5476@code{slim-service}}), a network management tool (@pxref{Networking
5477Services, @code{wicd-service}}), energy and color management services, 5477Services, @code{wicd-service}}), energy and color management services,
5478an NTP client and an SSH server (@pxref{Networking Services}), the Avahi 5478an NTP client (@pxref{Networking Services}), the Avahi
5479daemon, and has the name service switch service configured to be able to 5479daemon, and has the name service switch service configured to be able to
5480use @code{nss-mdns} (@pxref{Name Service Switch, mDNS}). 5480use @code{nss-mdns} (@pxref{Name Service Switch, mDNS}).
5481@end defvr 5481@end defvr
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 910dc1f9e09..7ed62d07b54 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -23,7 +23,6 @@
23 #:use-module (gnu services avahi) 23 #:use-module (gnu services avahi)
24 #:use-module (gnu services xorg) 24 #:use-module (gnu services xorg)
25 #:use-module (gnu services networking) 25 #:use-module (gnu services networking)
26 #:use-module (gnu services ssh)
27 #:use-module (gnu system shadow) 26 #:use-module (gnu system shadow)
28 #:use-module (gnu packages glib) 27 #:use-module (gnu packages glib)
29 #:use-module (gnu packages admin) 28 #:use-module (gnu packages admin)
@@ -286,7 +285,6 @@ site} for more information."
286 (dbus-service (list avahi wicd upower colord)) 285 (dbus-service (list avahi wicd upower colord))
287 286
288 (ntp-service) 287 (ntp-service)
289 (lsh-service)
290 288
291 (map (lambda (mservice) 289 (map (lambda (mservice)
292 ;; Provide an nscd ready to use nss-mdns. 290 ;; Provide an nscd ready to use nss-mdns.