import: utils: Rename guix-name to downstream-package-name.

* guix/import/cran.scm (cran-guix-name): Adjust.
* guix/import/crate.scm (crate-name->package-name): Adjust.
* guix/import/elpa.scm (elpa-guix-name): Adjust.
* guix/import/npm-binary.scm (npm-name->name): Adjust.
* guix/import/utils.scm (downstream-package-name): Add procedure.
[description]: Use definite article, uppercase 'name' argument.
(guix-name): Deprecate.

Change-Id: I374892be18fbeaae1bc051b8d0c79ca4c33ed8c4
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Herman Rimm 2024-12-20 18:32:32 +01:00 committed by Ludovic Courtès
parent 8695dcf9d2
commit a805c60151
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
5 changed files with 10 additions and 6 deletions

View file

@ -478,7 +478,7 @@ empty list when the FIELD cannot be found."
("zlib1g-dev" "zlib")
(_ sysname)))
(define cran-guix-name (cut guix-name "r-" <>))
(define cran-guix-name (cut downstream-package-name "r-" <>))
(define (directory-needs-fortran? dir)
"Check if the directory DIR contains Fortran source files."

View file

@ -467,7 +467,7 @@ look up the development dependencs for the given crate."
((name _ ...) name))))
(define (crate-name->package-name name)
(guix-name "rust-" name))
(downstream-package-name "rust-" name))

View file

@ -481,7 +481,7 @@ type '<elpa-package>'."
(pred package-from-elpa-repository?)
(import latest-release)))
(define elpa-guix-name (cut guix-name "emacs-" <>))
(define elpa-guix-name (cut downstream-package-name "emacs-" <>))
(define* (elpa-recursive-import package-name #:optional (repo 'gnu))
(recursive-import package-name

View file

@ -178,7 +178,7 @@
(define (clean name)
(string-map (lambda (chr) (if (char=? chr #\/) #\- chr))
(string-filter (negate (cut char=? <> #\@)) name)))
(guix-name "node-" (clean npm-name)))
(downstream-package-name "node-" (clean npm-name)))
(define (name+version->symbol name version)
(string->symbol (string-append name "-" version)))

View file

@ -37,6 +37,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix deprecation)
#:use-module (guix discovery)
#:use-module (guix build-system)
#:use-module ((guix i18n) #:select (G_))
@ -82,6 +83,7 @@
read-lines
chunk-lines
downstream-package-name
guix-name
recursive-import))
@ -612,14 +614,16 @@ separated by PRED."
(reverse res)
(loop (cdr after) res))))))
(define (guix-name prefix name)
"Return a Guix package name for a given package name."
(define (downstream-package-name prefix name)
"Return the Guix package name for a given package NAME."
(string-append prefix (string-map (match-lambda
(#\_ #\-)
(#\. #\-)
(chr (char-downcase chr)))
name)))
(define-deprecated/alias guix-name downstream-package-name)
(define (topological-sort nodes
node-dependencies
node-name)