mirror of
				https://codeberg.org/hako/Rosenthal.git
				synced 2025-11-04 03:34:37 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									3f8a932c8a
								
							
						
					
					
						commit
						895e8285b4
					
				@ -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)
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
            pkgs
 | 
			
		||||
            pkgs+out))
 | 
			
		||||
 | 
			
		||||
            spec->pkg
 | 
			
		||||
            spec->pkg+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)
 | 
			
		||||
  (map pkg specs))
 | 
			
		||||
(define (specs->pkgs . specs)
 | 
			
		||||
  (map spec->pkg specs))
 | 
			
		||||
 | 
			
		||||
(define (pkgs+out . specs)
 | 
			
		||||
  (map pkg+out specs))
 | 
			
		||||
(define (specs->pkgs+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)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user