mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
services: Use 'define-deprecated' for service procedures.
* gnu/services/base.scm (urandom-seed-service, gpm-service): Define using 'define-deprecated'. * gnu/services/messaging.scm (bitlbee-service): Likewise. * gnu/services/networking.scm (dhcp-client-service): Likewise. (ntp-service): Likewise. * gnu/services/xorg.scm (slim-service): Likewise. (gdm-service): Likewise.
This commit is contained in:
Ludovic Courtès
parent
787da810a0
commit
65a67bf711
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
(define-module (gnu services base)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (gnu services)
|
||||
#:use-module (gnu services shepherd)
|
||||
#:use-module (gnu system pam)
|
||||
|
|
@ -614,8 +615,9 @@ file systems, as well as corresponding @file{/etc/fstab} entries.")))
|
|||
generator (RNG) with the value recorded when the system was last shut
|
||||
down.")))
|
||||
|
||||
(define (urandom-seed-service) ;deprecated
|
||||
(service urandom-seed-service-type #f))
|
||||
(define-deprecated (urandom-seed-service)
|
||||
urandom-seed-service-type
|
||||
(service urandom-seed-service-type))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -2078,8 +2080,9 @@ command-line options. GPM allows users to use the mouse in the console,
|
|||
notably to select, copy, and paste text. The default options use the
|
||||
@code{ps2} protocol, which works for both USB and PS/2 mice.")))
|
||||
|
||||
(define* (gpm-service #:key (gpm gpm) ;deprecated
|
||||
(options %default-gpm-options))
|
||||
(define-deprecated (gpm-service #:key (gpm gpm)
|
||||
(options %default-gpm-options))
|
||||
gpm-service-type
|
||||
"Run @var{gpm}, the general-purpose mouse daemon, with the given
|
||||
command-line @var{options}. GPM allows users to use the mouse in the console,
|
||||
notably to select, copy, and paste text. The default value of @var{options}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
#:use-module (guix modules)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-35)
|
||||
#:use-module (ice-9 match)
|
||||
|
|
@ -882,9 +883,10 @@ string, you could instantiate a prosody service like this:
|
|||
"Run @url{http://bitlbee.org,BitlBee}, a daemon that acts as
|
||||
a gateway between IRC and chat networks.")))
|
||||
|
||||
(define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated
|
||||
(interface "127.0.0.1") (port 6667)
|
||||
(extra-settings ""))
|
||||
(define-deprecated (bitlbee-service #:key (bitlbee bitlbee)
|
||||
(interface "127.0.0.1") (port 6667)
|
||||
(extra-settings ""))
|
||||
bitlbee-service-type
|
||||
"Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that
|
||||
acts as a gateway between IRC and chat networks.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
|
|
@ -45,6 +45,7 @@
|
|||
#:use-module (guix gexp)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix modules)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (srfi srfi-26)
|
||||
|
|
@ -206,7 +207,8 @@ fe80::1%lo0 apps.facebook.com\n")
|
|||
(stop #~(make-kill-destructor))))
|
||||
isc-dhcp))
|
||||
|
||||
(define* (dhcp-client-service #:key (dhcp isc-dhcp)) ;deprecated
|
||||
(define-deprecated (dhcp-client-service #:key (dhcp isc-dhcp))
|
||||
dhcp-client-service-type
|
||||
"Return a service that runs @var{dhcp}, a Dynamic Host Configuration
|
||||
Protocol (DHCP) client, on all the non-loopback network interfaces."
|
||||
(service dhcp-client-service-type dhcp))
|
||||
|
|
@ -374,9 +376,10 @@ daemon of the @uref{http://www.ntp.org, Network Time Foundation}. The daemon
|
|||
will keep the system clock synchronized with that of the given servers.")
|
||||
(default-value (ntp-configuration))))
|
||||
|
||||
(define* (ntp-service #:key (ntp ntp) ;deprecated
|
||||
(servers %ntp-servers)
|
||||
allow-large-adjustment?)
|
||||
(define-deprecated (ntp-service #:key (ntp ntp)
|
||||
(servers %ntp-servers)
|
||||
allow-large-adjustment?)
|
||||
ntp-service-type
|
||||
"Return a service that runs the daemon from @var{ntp}, the
|
||||
@uref{http://www.ntp.org, Network Time Protocol package}. The daemon will
|
||||
keep the system clock synchronized with that of @var{servers}.
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix derivations)
|
||||
#:use-module (guix records)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (srfi srfi-26)
|
||||
|
|
@ -521,14 +522,15 @@ reboot_cmd " shepherd "/sbin/reboot\n"
|
|||
(const (list xterm)))))
|
||||
(default-value (slim-configuration))))
|
||||
|
||||
(define* (slim-service #:key (slim slim) ;deprecated
|
||||
(allow-empty-passwords? #t) auto-login?
|
||||
(default-user "")
|
||||
(theme %default-slim-theme)
|
||||
(theme-name %default-slim-theme-name)
|
||||
(xauth xauth) (shepherd shepherd)
|
||||
(auto-login-session #f)
|
||||
(startx (xorg-start-command)))
|
||||
(define-deprecated (slim-service #:key (slim slim)
|
||||
(allow-empty-passwords? #t) auto-login?
|
||||
(default-user "")
|
||||
(theme %default-slim-theme)
|
||||
(theme-name %default-slim-theme-name)
|
||||
(xauth xauth) (shepherd shepherd)
|
||||
(auto-login-session #f)
|
||||
(startx (xorg-start-command)))
|
||||
slim-service-type
|
||||
"Return a service that spawns the SLiM graphical login manager, which in
|
||||
turn starts the X display server with @var{startx}, a command as returned by
|
||||
@code{xorg-start-command}.
|
||||
|
|
@ -730,9 +732,10 @@ you to log in in a graphical session, whether or not you use GNOME.")))
|
|||
;; This service isn't working yet; it gets as far as starting to run the
|
||||
;; greeter from gnome-shell but doesn't get any further. It is here because
|
||||
;; it doesn't hurt anyone and perhaps it inspires someone to fix it :)
|
||||
(define* (gdm-service #:key (gdm gdm) ;deprecated
|
||||
(allow-empty-passwords? #t)
|
||||
(x-server (xorg-wrapper)))
|
||||
(define-deprecated (gdm-service #:key (gdm gdm)
|
||||
(allow-empty-passwords? #t)
|
||||
(x-server (xorg-wrapper)))
|
||||
gdm-service-type
|
||||
"Return a service that spawns the GDM graphical login manager, which in turn
|
||||
starts the X display server with @var{X}, a command as returned by
|
||||
@code{xorg-wrapper}.
|
||||
|
|
|
|||
Loading…
Reference in a new issue