diff mbox series

[bug#61693,v3] services: etc-service: Deprecate etc-service procedure.

Message ID 83cc0ca68a18f451ef9d2e888707e1977701f91d.1678728933.git.mirai@makinata.eu
State New
Headers show
Series [bug#61693,v3] services: etc-service: Deprecate etc-service procedure. | expand

Commit Message

Bruno Victal March 13, 2023, 5:36 p.m. UTC 
* gnu/services.scm (etc-service): Deprecate procedure.
* gnu/system.scm (operating-system-etc-service): Replace etc-service
with etc-service-type.
---

Changes from v2 to v3:
  * Resolved merge conflict.

 gnu/services.scm | 6 ++++--
 gnu/system.scm   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Ludovic Courtès March 16, 2023, 10:52 a.m. UTC | #1 
Hi,

Bruno Victal <mirai@makinata.eu> skribis:

> * gnu/services.scm (etc-service): Deprecate procedure.
> * gnu/system.scm (operating-system-etc-service): Replace etc-service
> with etc-service-type.
> ---
>
> Changes from v2 to v3:
>   * Resolved merge conflict.

Applied, thanks!  And apologies again for the merge conflict.

Ludo’.
diff mbox series

Patch

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 @@  (define-module (gnu services)
   #: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 @@  (define-module (gnu services)
 
             %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 @@  (define etc-service-type
                 (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 @@  (define* (operating-system-etc-service os)
   # 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"))