[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: services: etc-service: Deprecate etc-service procedure.
From: |
guix-commits |
Subject: |
03/06: services: etc-service: Deprecate etc-service procedure. |
Date: |
Thu, 16 Mar 2023 07:41:17 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 93918c67c5761d8f688cda5f5b49d5c49c7626d0
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Mon Mar 13 17:36:14 2023 +0000
services: etc-service: Deprecate etc-service procedure.
* gnu/services.scm (etc-service): Deprecate procedure.
* gnu/system.scm (operating-system-etc-service): Replace etc-service
with etc-service-type.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/services.scm | 6 ++++--
gnu/system.scm | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/services.scm b/gnu/services.scm
index 2abef557d4..d6c7ad0553 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -39,6 +39,7 @@
#:use-module (guix modules)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (guix deprecation)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages hurd)
@@ -122,7 +123,7 @@
%boot-service
%activation-service
- etc-service)
+ etc-service) ; deprecated
#:re-export (;; Note: Re-export 'delete' to allow for proper syntax matching
;; in 'modify-services' forms. See
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26805#16>.
@@ -804,7 +805,8 @@ directory."
(extend append)
(description "Populate the @file{/etc} directory.")))
-(define (etc-service files)
+(define-deprecated (etc-service files)
+ etc-service-type
"Return a new service of ETC-SERVICE-TYPE that populates /etc with FILES.
FILES must be a list of name/file-like object pairs."
(service etc-service-type files))
diff --git a/gnu/system.scm b/gnu/system.scm
index 887e537b48..48cc68f449 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1090,7 +1090,7 @@ then
# as those in ~/.guix-profile and /run/current-system/profile.
source /run/current-system/profile/etc/profile.d/bash_completion.sh
fi\n")))
- (etc-service
+ (service etc-service-type
`(("os-release" ,os-release)
("services" ,(file-append net-base "/etc/services"))
("protocols" ,(file-append net-base "/etc/protocols"))
- branch master updated (7636c49b45 -> 076fa659ef), guix-commits, 2023/03/16
- 01/06: gnu: nip2: Remove input labels., guix-commits, 2023/03/16
- 02/06: home: services: Add home-unclutter-service-type., guix-commits, 2023/03/16
- 05/06: build: Correct guix_system on musl libc distros., guix-commits, 2023/03/16
- 04/06: doc: Document 'shebang' for 'guix shell'., guix-commits, 2023/03/16
- 03/06: services: etc-service: Deprecate etc-service procedure.,
guix-commits <=
- 06/06: gnu: cat-avatar-generator: Update to 1-1.9360ea3., guix-commits, 2023/03/16