summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-11-02 22:03:15 +0100
committerLudovic Courtès <ludo@gnu.org>2015-11-02 22:25:12 +0100
commit87f40011462eea9142de9853377b2cee3c0df785 (patch)
tree17d5e63968e9131f877a74d7ddcf742d2ff313f1
parentaf4c3fd5e37d477bffce167909fbc0776a860204 (diff)
downloadpatches-87f40011462eea9142de9853377b2cee3c0df785.tar
patches-87f40011462eea9142de9853377b2cee3c0df785.tar.gz
services: wicd: Add Wicd to the system profile.
* gnu/services/networking.scm (wicd-service-type): Extend PROFILE-SERVICE-TYPE. (wicd-service): Mention it in docstring. * doc/guix.texi (Networking Services): Update documentation accordingly. * gnu/system/examples/desktop.tmpl (packages): Remove WICD.
-rw-r--r--doc/guix.texi10
-rw-r--r--gnu/services/networking.scm12
-rw-r--r--gnu/system/examples/desktop.tmpl4
3 files changed, 20 insertions, 6 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 897675291e..28c9a9c0cf 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -6447,9 +6447,15 @@ gateway.
@end deffn
@cindex wicd
+@cindex network management
@deffn {Scheme Procedure} wicd-service [#:wicd @var{wicd}]
-Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a
-network manager that aims to simplify wired and wireless networking.
+Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network
+management daemon that aims to simplify wired and wireless networking.
+
+This service adds the @var{wicd} package to the global profile, providing
+several commands to interact with the daemon and configure networking:
+@command{wicd-client}, a graphical user interface, and the @command{wicd-cli}
+and @command{wicd-curses} user interfaces.
@end deffn
@deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index d33ff4fc4a..8f67976b23 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -483,11 +483,19 @@ configuration file."
(service-extension dbus-root-service-type
list)
(service-extension activation-service-type
- (const %wicd-activation))))))
+ (const %wicd-activation))
+
+ ;; Add Wicd to the global profile.
+ (service-extension profile-service-type list)))))
(define* (wicd-service #:key (wicd wicd))
"Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network
-manager that aims to simplify wired and wireless networking."
+management daemon that aims to simplify wired and wireless networking.
+
+This service adds the @var{wicd} package to the global profile, providing
+several commands to interact with the daemon and configure networking:
+@command{wicd-client}, a graphical user interface, and the @command{wicd-cli}
+and @command{wicd-curses} user interfaces."
(service wicd-service-type wicd))
;;; networking.scm ends here
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index 41f66f693a..0e26a7ec5e 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -3,7 +3,7 @@
(use-modules (gnu) (gnu system nss))
(use-service-modules desktop)
-(use-package-modules xfce ratpoison wicd avahi xorg certs)
+(use-package-modules xfce ratpoison avahi xorg certs)
(operating-system
(host-name "antelope")
@@ -40,7 +40,7 @@
;; Add Xfce and Ratpoison; that allows us to choose
;; sessions using either of these at the log-in screen.
(packages (cons* xfce ratpoison ;desktop environments
- xterm wicd avahi ;useful tools
+ xterm avahi ;useful tools
nss-certs ;for HTTPS access
%base-packages))