seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-08-22 22:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

utils: Rename package specification procedures.

Browse Source 
* 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.
This commit is contained in:
Hilton Chain 2025-06-15 19:19:25 +08:00
parent 3f8a932c8a
commit 895e8285b4
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rosenthal/services/cuirass.scm
View File

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

27
modules/rosenthal/utils/packages.scm
View File

@ -5,6 +5,7 @@
(define-module (rosenthal utils packages) (define-module (rosenthal utils packages)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix deprecation)
#:use-module (guix diagnostics) #:use-module (guix diagnostics)
#:use-module (guix discovery) #:use-module (guix discovery)
#:use-module (guix i18n) #:use-module (guix i18n)
@ -21,10 +22,11 @@
rosenthal-disable-updater? rosenthal-disable-updater?
delete-package-from-list delete-package-from-list
pkg
pkg+out spec->pkg
pkgs spec->pkg+out
pkgs+out)) specs->pkgs
specs->pkgs+out))
(define %rosenthal-root-directory (define %rosenthal-root-directory
;; This is like %distro-root-directory from (gnu packages), with adjusted ;; 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)))) (not (string=? name (package-name pkg))))
lst)) lst))
(define (pkg spec) (define (spec->pkg spec)
(specification->package spec)) (specification->package spec))
(define (pkg+out spec) (define (spec->pkg+out spec)
(specification->package+output 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)