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

Package	Source(s)		Maintainer(s)
guix-patches		PTS Buildd Popcon

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

Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:56 +0000
From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:35:56 2024
Received: from localhost ([127.0.0.1]:43916 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tOguo-0004mf-Lt
	for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:56 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46013
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@rimm.ee>) id 1tOgum-0004mD-9H
 for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:53 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1734716146;
 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:
 in-reply-to:in-reply-to:references:references;
 bh=blJyxyxoc5TqczlJC20HdsFPd1qut/ny99vIuEvIiUM=;
 b=gRsklu4HoWy1Onun7Usr8MEnNCGyFd+l8vM02/q71SyotqdH4voppRltslOkCTtHCuaa+r
 pvcsJkCKVHU/9cb00EhscDPVfq+QFxinOSzLZSWZYXjYwdXc8kx/r7iz2PKgDfayjRpG9j
 4APtlxBg99ptYOZJiZGSbLJzK/px4aXoqkGtCs6Z20Oynn64cj1bySpWMwBi/Vs9bWvnx0
 Jnr742NDsZe/bOAtGYsqXEs+81ZKOcToryDx37DHg0gjiIZV/XQ1LOxmkKDnpxfD9ckhPf
 nWcGPut6neiGHYoACm+GQ5N+2/X/5UvUgUo06TRQ7ArqS/RdcHOGBR/ziqT52Q==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1b26efb6
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:46 +0000 (UTC)
From: Herman Rimm <herman@rimm.ee>
To: 74997@debbugs.gnu.org
Subject: [PATCH 2/5] import: texlive: Remove guix-name.
Date: Fri, 20 Dec 2024 18:35:02 +0100
Message-ID: <637157ea86bca3acf0dc63f243b9b0c642e4ec75.1734715617.git.herman@rimm.ee>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <e8e619647cf325c69d274e0ff0b49ed9115327ac.1734715617.git.herman@rimm.ee>
References: <e8e619647cf325c69d274e0ff0b49ed9115327ac.1734715617.git.herman@rimm.ee>
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@enge.fr>,
 Nicolas Goaziou <guix@nicolasgoaziou.fr>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74997
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: -1.0 (-)

* guix/import/texlive.scm (guix-name): Remove.
(list-upstream-inputs, tlpdb->package): Use downstream-package-name.

Change-Id: I8f04d27a42f762c5604cb8874042fabbbe1e9873
---
 guix/import/texlive.scm | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 6d04cc25ee..8ce22a1d59 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -334,15 +334,6 @@ (define string->license
     ((lst ...) `(list ,@(map string->license lst)))
     (x `(error unknown-license ,x))))
 
-(define (guix-name name)
-  "Return a Guix package name for a given Texlive package NAME."
-  (string-append "texlive-"
-                 (string-map (match-lambda
-                               (#\_ #\-)
-                               (#\. #\-)
-                               (chr (char-downcase chr)))
-                             name)))
-
 (define* (filter-depends depends #:optional texlive-only)
   "Filter upstream package names DEPENDS to include only their equivalent Guix
 package names, without \"texlive-\" prefix.  When TEXLIVE-ONLY is true, ignore
@@ -578,7 +569,8 @@ (define (list-upstream-inputs upstream-name version database)
        (map (lambda (input-name)
               (upstream-input
                (name input-name)
-               (downstream-name (guix-name input-name))
+               (downstream-name (downstream-package-name "texlive-"
+                                                         input-name))
                (type 'propagated)))
             (sort (append
                    (filter-depends (or (assoc-ref package-data 'depend) '()))
@@ -655,7 +647,7 @@ (define (texlive->svn-multi-reference upstream-name version database)
 
 (define (tlpdb->package upstream-name version database)
   (and-let* ((data (assoc-ref database upstream-name))
-             (name (guix-name upstream-name))
+             (name (downstream-package-name "texlive-" upstream-name))
              (reference
               (texlive->svn-multi-reference upstream-name version database))
              (source (with-store store
-- 
2.45.2

Display info messages

Send a report that this bug log contains spam.

debbugs.gnu.org maintainers <help-debbugs@gnu.org>. Last modified: Sun Dec 22 09:55:31 2024; Machine Name: wallace-server

GNU bug tracking system

Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

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