utils: Rename package specification procedures.

* modules/rosenthal/utils/packages.scm (pkg): Deprecate and rename to
spec->pkg.
(pkg+out): Deprecate and rename to spec->pkg+out.
(pkgs): Deprecate and rename to specs->pkgs.
(pkgs+out): Deprecate and rename to specs->pkgs+out.

modules/rosenthal/services/cuirass.scm

@@ -159,7 +159,7 @@
         (services
          (cons (service cuirass-remote-worker-for-container
                  (cuirass-remote-worker-configuration
-                   (cuirass (pkg "cuirass-hako"))
+                   (cuirass (spec->pkg "cuirass-hako"))
                    (workers workers)
                    (server server)
                    (systems supported-systems)

modules/rosenthal/services/keyboard.scm

@@ -5,8 +5,7 @@
 (define-module (rosenthal services keyboard)
   #:use-module (gnu system keyboard)
   #:use-module (gnu home services)
-  #:export (set-xkb-variables
+  #:export (home-keyboard-service-type))
-            home-keyboard-service-type))
 
 (define (set-xkb-variables layout)
   (if layout

modules/rosenthal/system/keyboard.scm

@@ -1,76 +0,0 @@
-;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
-
-(define-module (rosenthal system keyboard)
-  #:use-module (srfi srfi-9 gnu)
-  #:use-module (ice-9 match)
-  #:use-module (guix gexp)
-  #:export (keyboard-layout
-            keyboard-layout->console-keymap))
-
-;; Copied from (gnu system keyboard), with package dependencies removed.  To
-;; use this module, packages ‘console-setup’ and ‘xkeyboard-config’ should be
-;; installed into the system profile.
-
-;; Copied from (gnu system keyboard) to avoid package dependencies.
-(define-immutable-record-type <keyboard-layout>
-  (%keyboard-layout name variant model options)
-  keyboard-layout?
-  (name      keyboard-layout-name)                ;string
-  (variant   keyboard-layout-variant)             ;#f | string
-  (model     keyboard-layout-model)               ;#f | string
-  (options   keyboard-layout-options))            ;list of strings
-
-(define* (keyboard-layout name #:optional variant
-                          #:key model (options '()))
-  "Return a new keyboard layout with the given NAME and VARIANT.
-
-NAME must be a string such as \"fr\"; VARIANT must be a string such as
-\"bepo\" or \"nodeadkeys\".  See the 'xkeyboard-config' package for valid
-options."
-  (%keyboard-layout name variant model options))
-
-(define* (keyboard-layout->console-keymap layout)
-  "Return a Linux console keymap file for LAYOUT, a <keyboard-layout> record.
-Layout information is taken from the XKEYBOARD-CONFIG package."
-  (define %current-system
-    "/run/current-system/profile")
-
-  (define build
-    (with-imported-modules '((guix build utils))
-      #~(begin
-          (use-modules (guix build utils)
-                       (ice-9 popen)
-                       (ice-9 match))
-
-          (define pipe
-            (open-pipe* OPEN_READ
-                        (in-vicinity %current-system "bin/ckbcomp")
-                        (string-append
-                         "-I" (in-vicinity %current-system "share/X11/xkb"))
-                        "-rules" "base"
-                        #$@(match (keyboard-layout-model layout)
-                             (#f      '())
-                             (model   `("-model" ,model)))
-                        #$(keyboard-layout-name layout)
-                        #$(or (keyboard-layout-variant layout)
-                              "")
-                        #$(string-join (keyboard-layout-options layout) ",")))
-
-          (call-with-output-file #$output
-            (lambda (output)
-              (dump-port pipe output)))
-
-          ;; Note: ckbcomp errors out when the layout name is unknown, but
-          ;; merely emits a warning when the variant is unknown.
-          (unless (zero? (close-pipe pipe))
-            (error "failed to create console keymap for keyboard layout"
-                   #$(keyboard-layout-name layout))))))
-
-  (computed-file (string-append "console-keymap."
-                                (string-map (match-lambda
-                                              (#\, #\-)
-                                              (chr chr))
-                                            (keyboard-layout-name layout)))
-                 build))

modules/rosenthal/utils/packages.scm

@@ -5,6 +5,7 @@
 
 (define-module (rosenthal utils packages)
   #:use-module (gnu packages)
+  #:use-module (guix deprecation)
   #:use-module (guix diagnostics)
   #:use-module (guix discovery)
   #:use-module (guix i18n)
@@ -21,10 +22,11 @@
 
             rosenthal-disable-updater?
             delete-package-from-list
-            pkg
+
-            pkg+out
+            spec->pkg
-            pkgs
+            spec->pkg+out
-            pkgs+out))
+            specs->pkgs
+            specs->pkgs+out))
 
 (define %rosenthal-root-directory
   ;; This is like %distro-root-directory from (gnu packages), with adjusted
@@ -111,14 +113,19 @@ packages, excluding superseded packages."
             (not (string=? name (package-name pkg))))
           lst))
 
-(define (pkg spec)
+(define (spec->pkg spec)
   (specification->package spec))
 
-(define (pkg+out spec)
+(define (spec->pkg+out spec)
   (specification->package+output spec))
 
-(define (pkgs . specs)
+(define (specs->pkgs . specs)
-  (map pkg specs))
+  (map spec->pkg specs))
 
-(define (pkgs+out . specs)
+(define (specs->pkgs+out . specs)
-  (map pkg+out specs))
+  (map spec->pkg+out specs))
+
+(define-deprecated/public-alias pkg spec->pkg)
+(define-deprecated/public-alias pkg+out spec->pkg+out)
+(define-deprecated/public-alias pkgs specs->pkgs)
+(define-deprecated/public-alias pkgs+out specs->pkgs+out)