From patchwork Fri Dec 20 17:35:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35097 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABC7927BBE2; Fri, 20 Dec 2024 17:36:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 54F9227BBE9 for ; Fri, 20 Dec 2024 17:36:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOgv4-0006zv-Eg; Fri, 20 Dec 2024 12:36:10 -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 ) id 1tOgux-0006zC-Hw for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOgux-00075N-8z for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=blJyxyxoc5TqczlJC20HdsFPd1qut/ny99vIuEvIiUM=; b=Qoob2iZZ7T7S4SM9fsGJDGjsabxy/XkQPjBTVnVX64EfStEFe+mB7yE93HJHVNMa6lZPB5m+bfzmTTeVcz6QFx6/fslNzxAd/AL/Ayc1RC2gMoTjLRw5bdSqYUZY3c24MkHawcLVsGJVmn3tikOt+azWKlAgWw9VvTfN0qYivMdhyYs5mrpBlYUNvFf5p3BnPP9aiE+OWUKY24uyypR0luYe8W+/ifDJmsUR3UdRZp86hAlqbizw2uMG1nRs+GfPQSlGiBrOZqd5q3WeJrc1JNr2q/yU4FYSgKDALdIOn9mKXuZjjJoQsc7SKu5xr9sXsnLOgnK1ZcFprNzYtP3COw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOguw-0004nd-8i; Fri, 20 Dec 2024 12:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74997] [PATCH 2/5] import: texlive: Remove guix-name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix@nicolasgoaziou.fr, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 17:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74997@debbugs.gnu.org Cc: Andreas Enge , Nicolas Goaziou X-Debbugs-Original-Xcc: Andreas Enge , Nicolas Goaziou Received: via spool by 74997-submit@debbugs.gnu.org id=B74997.173471615618413 (code B ref 74997); Fri, 20 Dec 2024 17:36:02 +0000 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:56 +0000 Received: from localhost ([127.0.0.1]:43916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) 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 ) 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) 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: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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