summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-10 23:33:36 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-11 12:14:38 +0100
commit84a2de36a10dc2ab80f86e16721cbd228c85279e (patch)
tree83be420bf45f903b0c6202f37802a925b129f275
parentbabfd9447df08a809622238b4830eb046dab2ba6 (diff)
services: Deprecate a few more service procedures.
These procedures were already either undocumented (and de facto deprecated) or documented as deprecated or redundant. * gnu/services/base.scm (guix-service, guix-publish-service): Mark as deprecated. * gnu/services/mcron.scm (mcron-service): Likewise. * gnu/services/networking.scm (tor-service): Likewise. * doc/guix.texi (Scheduled Job Execution): Remove 'mcron-service' and adjust example. (Networking Services): Remove 'tor-service'. * gnu/tests/base.scm (%mcron-os): Use 'mcron-service-type' instead of 'mcron-service'. * gnu/tests/networking.scm (%tor-os): Use 'tor-service-type' instead of 'tor-service'. * tests/guix-system.sh: Likewise.
-rw-r--r--doc/guix.texi25
-rw-r--r--gnu/services/base.scm8
-rw-r--r--gnu/services/mcron.scm6
-rw-r--r--gnu/services/networking.scm7
-rw-r--r--gnu/system/install.scm3
-rw-r--r--gnu/tests/base.scm5
-rw-r--r--gnu/tests/networking.scm2
-rw-r--r--tests/guix-system.sh6
8 files changed, 29 insertions, 33 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index c0cc8d4169..ed7723c00b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11684,9 +11684,11 @@ gexps to introduce job definitions that are passed to mcron
(operating-system
;; @dots{}
- (services (cons (mcron-service (list garbage-collector-job
- updatedb-job
- idutils-job))
+ (services (cons (service mcron-service-type
+ (mcron-configuration
+ (jobs (list garbage-collector-job
+ updatedb-job
+ idutils-job))))
%base-services)))
@end lisp
@@ -11709,17 +11711,6 @@ also specify the number of tasks to display:
# herd schedule mcron 10
@end example
-@deffn {Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron}]
-Return an mcron service running @var{mcron} that schedules @var{jobs}, a
-list of gexps denoting mcron job specifications.
-
-This is a shorthand for:
-@example
-(service mcron-service-type
- (mcron-configuration (mcron mcron) (jobs jobs)))
-@end example
-@end deffn
-
@defvr {Scheme Variable} mcron-service-type
This is the type of the @code{mcron} service, whose value is an
@code{mcron-configuration} object.
@@ -12313,12 +12304,6 @@ Tor} anonymous networking daemon. The service is configured using a
@end defvr
-@deffn {Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}]
-This procedure is deprecated and will be removed in a future release. Return
-a service of the @code{tor-service-type} type. @var{config-file} and
-@var{tor} have the same meaning as in @code{<tor-configuration>}.
-@end deffn
-
@deftp {Data Type} tor-configuration
@table @asis
@item @code{tor} (default: @code{tor})
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6e99cbfec4..8395a856fc 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1688,7 +1688,9 @@ failed to register public key '~a': ~a~%" key status)))))))
(description
"Run the build daemon of GNU@tie{}Guix, aka. @command{guix-daemon}.")))
-(define* (guix-service #:optional (config %default-guix-configuration))
+(define-deprecated (guix-service #:optional
+ (config %default-guix-configuration))
+ guix-service-type
"Return a service that runs the Guix build daemon according to
@var{config}."
(service guix-service-type config))
@@ -1789,7 +1791,9 @@ failed to register public key '~a': ~a~%" key status)))))))
"Add a Shepherd service running @command{guix publish}, a
command that allows you to share pre-built binaries with others over HTTP.")))
-(define* (guix-publish-service #:key (guix guix) (port 80) (host "localhost"))
+(define-deprecated (guix-publish-service #:key (guix guix)
+ (port 80) (host "localhost"))
+ guix-publish-service-type
"Return a service that runs @command{guix publish} listening on @var{host}
and @var{port} (@pxref{Invoking guix publish}).
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm
index 120b663e3e..e4b652b3d4 100644
--- a/gnu/services/mcron.scm
+++ b/gnu/services/mcron.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,6 +21,7 @@
#:use-module (gnu services base)
#:use-module (gnu services shepherd)
#:autoload (gnu packages guile) (mcron)
+ #:use-module (guix deprecation)
#:use-module (guix records)
#:use-module (guix gexp)
#:use-module (srfi srfi-1)
@@ -142,7 +143,8 @@ files."
jobs)))))
(default-value (mcron-configuration)))) ;empty job list
-(define* (mcron-service jobs #:optional (mcron mcron))
+(define-deprecated (mcron-service jobs #:optional (mcron mcron))
+ mcron-service-type
"Return an mcron service running @var{mcron} that schedules @var{jobs}, a
list of gexps denoting mcron job specifications.
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 2f49bf28dd..cab129e0c3 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -755,9 +755,10 @@ HiddenServicePort ~a ~a~%"
"Run the @uref{https://torproject.org, Tor} anonymous
networking daemon.")))
-(define* (tor-service #:optional
- (config-file (plain-file "empty" ""))
- #:key (tor tor))
+(define-deprecated (tor-service #:optional
+ (config-file (plain-file "empty" ""))
+ #:key (tor tor))
+ tor-service-type
"Return a service to run the @uref{https://torproject.org, Tor} anonymous
networking daemon.
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index c345ba0626..19a6f6a038 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -253,7 +253,8 @@ You have been warned. Thanks for being so brave.\x1b[0m
;; The build daemon. Register the official server keys as trusted.
;; This allows the installation process to use substitutes by
;; default.
- (guix-service (guix-configuration (authorize-key? #t)))
+ (service guix-service-type
+ (guix-configuration (authorize-key? #t)))
;; Start udev so that useful device nodes are available.
;; Use device-mapper rules for cryptsetup & co; enable the CRDA for
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 8d4e218a8f..2b20aac1dc 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
@@ -627,7 +627,8 @@ non-ASCII names from /tmp.")
(job3 #~(job next-second-from ;to test $PATH
"touch witness-touch")))
(simple-operating-system
- (mcron-service (list job1 job2 job3)))))
+ (service mcron-service-type
+ (mcron-configuration (jobs (list job1 job2 job3)))))))
(define (run-mcron-test name)
(define os
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index 9f12a4ae8d..a97b29bc4b 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -351,7 +351,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
(define %tor-os
(simple-operating-system
- (tor-service)))
+ (service tor-service-type)))
(define %tor-os/unix-socks-socket
(simple-operating-system
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 23d2da4903..adb623d244 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
#
@@ -258,7 +258,9 @@ cat > "$tmpdir/config.scm"<<EOF
(operating-system
$OS_BASE
- (services (cons (tor-service (local-file "my-torrc"))
+ (services (cons (service tor-service-type
+ (tor-configuration
+ (config-file (local-file "my-torrc"))))
%base-services)))
EOF