From a805c60151bdc0b4ea15bee0a7ae324b920106f7 Mon Sep 17 00:00:00 2001
From: Herman Rimm <herman@rimm.ee>
Date: Fri, 20 Dec 2024 18:32:32 +0100
Subject: [PATCH] import: utils: Rename guix-name to downstream-package-name.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>
---
 guix/import/cran.scm       | 2 +-
 guix/import/crate.scm      | 2 +-
 guix/import/elpa.scm       | 2 +-
 guix/import/npm-binary.scm | 2 +-
 guix/import/utils.scm      | 8 ++++++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index fe69cb87f7c78102f18737fbdd232fd8d9fc4f9a..3bea9439e102f416425ecb2124c7b412327279ac 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -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."
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 5996571cda97c9077ccba2132be08f09f89aa000..c50f0a8415ed772eb2b53036d884dbb0caa0445f 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -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))
 
 
 
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 46b6dc98a205297e36a35a133204a3761dbe3e04..b86a6a546b68b3d4d4db440d016fb6dabc9adee0 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -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
diff --git a/guix/import/npm-binary.scm b/guix/import/npm-binary.scm
index 6dfedc4910379761a0ea51f26b07509a4206b0b0..92ac7d338e9d59761224058fd3aff3a2fa1411c2 100644
--- a/guix/import/npm-binary.scm
+++ b/guix/import/npm-binary.scm
@@ -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)))
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index e45c8dfb20721f3d76ed8ecda5fb2a1556ad85d5..0b1b3b3298624ec55cbdae074e66e2e30db84682 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -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)