#74997 [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name.

Message #5 received at submit@debbugs.gnu.org (full text, mbox, reply):

Received: (at submit) by debbugs.gnu.org; 20 Dec 2024 17:33:27 +0000
From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:33:27 2024
Received: from localhost ([127.0.0.1]:43894 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tOgsQ-0004as-UF
	for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:33:27 -0500
Received: from lists.gnu.org ([209.51.188.17]:37846)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@rimm.ee>) id 1tOgsO-0004ai-9r
 for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:33:25 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <herman@rimm.ee>) id 1tOgsN-0006Q0-R7
 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:33:24 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]
 helo=email.rimm.ee)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
 (Exim 4.90_1) (envelope-from <herman@rimm.ee>) id 1tOgsL-0004WE-89
 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:33:23 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1734715994;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding;
 bh=omTJOqC55pPW78GSKunJkwx4C8V8fprVyTeIAE6IbX4=;
 b=KcxuCcG9ctw8DFU+3n+7Fw6SxamfsakGj0ZZ/GfZEIBPost3Nq3IHjcAap9jQm9WWr4Bum
 ELma7uryXqASSK42iY3to6XEEGNjs8cHX1GNi8YkWVH+Ah7BvtbSmSsIUHGslF+hMiO0AT
 8sskZ5mK3SfVSFHgjGdvQTT+xzSyKy4m9fGL0etKh4pB0Fa8GwsIY1W1R/AYnk1ok2Jtdv
 4eyu9CN69Nv8ujVhJ42+goDlbONWOpro46qkTHBLZNyFwczdaCYmpQj/htVGyvb3Rk+U3R
 2a2vNRMarrF4HEVexeLmlHgjFX9QE0KAQlzbrINUzfXxtjiQA/l3Q7L+fmFIFg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 07d1142e
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <guix-patches@gnu.org>; Fri, 20 Dec 2024 17:33:14 +0000 (UTC)
From: Herman Rimm <herman@rimm.ee>
To: guix-patches@gnu.org
Subject: [PATCH 1/5] import: utils: Rename guix-name to
 downstream-package-name.
Date: Fri, 20 Dec 2024 18:32:32 +0100
Message-ID: <e8e619647cf325c69d274e0ff0b49ed9115327ac.1734715617.git.herman@rimm.ee>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
X-Debbugs-Cc: Andrew Tropin <andrew@trop.in>,
 Efraim Flashner <efraim@flashner.co.il>,
 Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>,
 Laurent Gatto <laurent.gatto@gmail.com>,
 Liliana Marie Prikler <liliana.prikler@gmail.com>,
 Ricardo Wurmus <rekado@elephly.net>, Simon Tournier <zimon.toutoune@gmail.com>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee;
 helo=email.rimm.ee
X-Spam_score_int: -16
X-Spam_score: -1.7
X-Spam_bar: -
X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1,
 DKIM_SIGNED=0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
 RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 TVD_RCVD_IP=0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

* 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
---
 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 fe69cb87f7..3bea9439e1 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -478,7 +478,7 @@ (define (transform-sysname sysname)
     ("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 5996571cda..c50f0a8415 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -467,7 +467,7 @@ (define (guix-package->crate-name package)
       ((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 46b6dc98a2..b86a6a546b 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -481,7 +481,7 @@ (define %elpa-updater
    (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 6dfedc4910..92ac7d338e 100644
--- a/guix/import/npm-binary.scm
+++ b/guix/import/npm-binary.scm
@@ -178,7 +178,7 @@ (define (npm-name->name npm-name)
   (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 e45c8dfb20..0b1b3b3298 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -37,6 +37,7 @@ (define-module (guix import utils)
   #: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 @@ (define-module (guix import utils)
             read-lines
             chunk-lines
 
+            downstream-package-name
             guix-name
 
             recursive-import))
@@ -612,14 +614,16 @@ (define* (chunk-lines lines #:optional (pred string-null?))
             (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)

base-commit: 7f91b12fe31baa0838ae2e942d4515911e71b137
-- 
2.45.2

Send a report that this bug log contains spam.