ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: Use 'define-deprecated' for service procedures.

Browse source 
* 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 2019-01-10 14:50:09 +01:00
parent 787da810a0
commit 65a67bf711
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/services/base.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
@ -25,6 +25,7 @@
(define-module (gnu services base) (define-module (gnu services base)
#:use-module (guix store) #:use-module (guix store)
#:use-module (guix deprecation)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu system pam) #:use-module (gnu system pam)
@ -614,8 +615,9 @@ (define urandom-seed-service-type
generator (RNG) with the value recorded when the system was last shut generator (RNG) with the value recorded when the system was last shut
down."))) down.")))
(define (urandom-seed-service) ;deprecated (define-deprecated (urandom-seed-service)
(service urandom-seed-service-type #f)) urandom-seed-service-type
(service urandom-seed-service-type))
;;; ;;;
@ -2078,8 +2080,9 @@ (define gpm-service-type
notably to select, copy, and paste text. The default options use the notably to select, copy, and paste text. The default options use the
@code{ps2} protocol, which works for both USB and PS/2 mice."))) @code{ps2} protocol, which works for both USB and PS/2 mice.")))
(define* (gpm-service #:key (gpm gpm) ;deprecated (define-deprecated (gpm-service #:key (gpm gpm)
(options %default-gpm-options)) (options %default-gpm-options))
gpm-service-type
"Run @var{gpm}, the general-purpose mouse daemon, with the given "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, 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} notably to select, copy, and paste text. The default value of @var{options}

10
gnu/services/messaging.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; 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> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -32,6 +32,7 @@ (define-module (gnu services messaging)
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix deprecation)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -882,9 +883,10 @@ (define bitlbee-service-type
"Run @url{http://bitlbee.org,BitlBee}, a daemon that acts as "Run @url{http://bitlbee.org,BitlBee}, a daemon that acts as
a gateway between IRC and chat networks."))) a gateway between IRC and chat networks.")))
(define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated (define-deprecated (bitlbee-service #:key (bitlbee bitlbee)
(interface "127.0.0.1") (port 6667) (interface "127.0.0.1") (port 6667)
(extra-settings "")) (extra-settings ""))
bitlbee-service-type
"Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that "Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that
acts as a gateway between IRC and chat networks. acts as a gateway between IRC and chat networks.

13
gnu/services/networking.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
@ -45,6 +45,7 @@ (define-module (gnu services networking)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (guix deprecation)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -206,7 +207,8 @@ (define ifaces
(stop #~(make-kill-destructor)))) (stop #~(make-kill-destructor))))
isc-dhcp)) 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 "Return a service that runs @var{dhcp}, a Dynamic Host Configuration
Protocol (DHCP) client, on all the non-loopback network interfaces." Protocol (DHCP) client, on all the non-loopback network interfaces."
(service dhcp-client-service-type dhcp)) (service dhcp-client-service-type dhcp))
@ -374,9 +376,10 @@ (define ntp-service-type
will keep the system clock synchronized with that of the given servers.") will keep the system clock synchronized with that of the given servers.")
(default-value (ntp-configuration)))) (default-value (ntp-configuration))))
(define* (ntp-service #:key (ntp ntp) ;deprecated (define-deprecated (ntp-service #:key (ntp ntp)
(servers %ntp-servers) (servers %ntp-servers)
allow-large-adjustment?) allow-large-adjustment?)
ntp-service-type
"Return a service that runs the daemon from @var{ntp}, the "Return a service that runs the daemon from @var{ntp}, the
@uref{http://www.ntp.org, Network Time Protocol package}. The daemon will @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will
keep the system clock synchronized with that of @var{servers}. keep the system clock synchronized with that of @var{servers}.

25
gnu/services/xorg.scm
View file

@ -40,6 +40,7 @@ (define-module (gnu services xorg)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix deprecation)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -521,14 +522,15 @@ (define slim-service-type
(const (list xterm))))) (const (list xterm)))))
(default-value (slim-configuration)))) (default-value (slim-configuration))))
(define* (slim-service #:key (slim slim) ;deprecated (define-deprecated (slim-service #:key (slim slim)
(allow-empty-passwords? #t) auto-login? (allow-empty-passwords? #t) auto-login?
(default-user "") (default-user "")
(theme %default-slim-theme) (theme %default-slim-theme)
(theme-name %default-slim-theme-name) (theme-name %default-slim-theme-name)
(xauth xauth) (shepherd shepherd) (xauth xauth) (shepherd shepherd)
(auto-login-session #f) (auto-login-session #f)
(startx (xorg-start-command))) (startx (xorg-start-command)))
slim-service-type
"Return a service that spawns the SLiM graphical login manager, which in "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 turn starts the X display server with @var{startx}, a command as returned by
@code{xorg-start-command}. @code{xorg-start-command}.
@ -730,9 +732,10 @@ (define gdm-service-type
;; This service isn't working yet; it gets as far as starting to run the ;; 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 ;; 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 :) ;; it doesn't hurt anyone and perhaps it inspires someone to fix it :)
(define* (gdm-service #:key (gdm gdm) ;deprecated (define-deprecated (gdm-service #:key (gdm gdm)
(allow-empty-passwords? #t) (allow-empty-passwords? #t)
(x-server (xorg-wrapper))) (x-server (xorg-wrapper)))
gdm-service-type
"Return a service that spawns the GDM graphical login manager, which in turn "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 starts the X display server with @var{X}, a command as returned by
@code{xorg-wrapper}. @code{xorg-wrapper}.