From patchwork Fri Dec 20 17:32:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35093 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 5A5B827BBEA; Fri, 20 Dec 2024 17:34:16 +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=-3.9 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, SORTED_RECIPS,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 69CFC27BBE2 for ; Fri, 20 Dec 2024 17:34:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOgt5-0006iE-CL; Fri, 20 Dec 2024 12:34:08 -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 1tOgt3-0006i4-DS for guix-patches@gnu.org; Fri, 20 Dec 2024 12:34:05 -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 1tOgt3-0004dZ-4Y for guix-patches@gnu.org; Fri, 20 Dec 2024 12:34:05 -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:Date:From:To:Subject; bh=6D9Sm+SrxlSo12mu/e0uN2GQyHaIODKg8RJfdY/tH/I=; b=OUSG5p8Cpd8gg9xdikK0JYMPHwo8+6H9TFjVSMcocoLZkGFGKnsGpnATefcvW5OAlK1wsxOzCVw54ZXRFwfxUonzMKDOTsdeSCY3GqcZ+0uxVyl0+bOSCvvZ2+dcjiPQef+EZlEX8yZ49LeteuBrhAMjFOcCSfi+7o4kAmWEHEscTSlOTNXWFqTH1VyNGgWrBgMOnLFIwYgmknp+MaUl6GiBGRiO1bvf0GNLdAycT3NfUoqjK9QRPdw9REf5mXEHgJ/+0MTUazvsl9mUadG17eiJbM+5jJ1YKqgS4RVnQttJGHEXOHdkoUvdNZmC5qz3cJ6KaXoQr/HBXCC2L3/rfQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOgsz-0004cS-P9; Fri, 20 Dec 2024 12:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74997] [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, efraim@flashner.co.il, cox.katherine.e+guix@gmail.com, laurent.gatto@gmail.com, liliana.prikler@gmail.com, rekado@elephly.net, zimon.toutoune@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 17:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74997@debbugs.gnu.org Cc: Andrew Tropin , Efraim Flashner , Katherine Cox-Buday , Laurent Gatto , Liliana Marie Prikler , Ricardo Wurmus , Simon Tournier X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Efraim Flashner , Katherine Cox-Buday , Laurent Gatto , Liliana Marie Prikler , Ricardo Wurmus , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.173471600717667 (code B ref -1); Fri, 20 Dec 2024 17:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Dec 2024 17:33:27 +0000 Received: from localhost ([127.0.0.1]:43894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) 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 ) 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 ) 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 ) 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 ; Fri, 20 Dec 2024 17:33:14 +0000 (UTC) Date: Fri, 20 Dec 2024 18:32:32 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 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-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/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(-) base-commit: 7f91b12fe31baa0838ae2e942d4515911e71b137 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) 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 From patchwork Fri Dec 20 17:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35095 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 9AA1427BBE9; Fri, 20 Dec 2024 17:36:32 +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 25ADC27BBE2 for ; Fri, 20 Dec 2024 17:36:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOgv9-00071M-I0; Fri, 20 Dec 2024 12:36:15 -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 1tOgv6-00070X-A0 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:12 -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 1tOgv6-00076w-0J; Fri, 20 Dec 2024 12:36:12 -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=FNiZV16DVl+v9tOWOXt1Jg/qFHHhOrF/yWnRsJTDfCU=; b=k2W9Qt8VKIrrortSAcnHgovnONHOlFmlf/F2eRni12wJSPW1atM4cDrkYuni3qx5LNZ6XQVcXsGF8oxOgXWP7P4uGD8CdASnP9mBbzrGUFqZk0MbhA+Q0fNeVVxKMJY2+POBwYQwqCrOYj/vYJJiP1n9OqB/V6KTWKGY9cdvngj4ELBtNSiOOsEd/wk0pIgbWw2QzFklr4jlv3DzIm8TGdMhKXb1niyjucPSOd+Wwn5+d1rW+2o5sWtNpBuHz5Zr3xav+Q5swwEakb+oy4ESZzzCzPneVCm2Vi7G2BJnQyXcbRgh2yySldemoH8vEt0xfN3xn8NSnxLHc4RQGYwkWw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOguw-0004nj-NV; Fri, 20 Dec 2024 12:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74997] [PATCH 3/5] import: utils: Move downstream-package-name to (guix utils). Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, andrew@trop.in, guix@cbaines.net, dev@jpoiret.xyz, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, ludo@gnu.org, othacehe@gnu.org, guix@nicolasgoaziou.fr, zimon.toutoune@gmail.com, me@tobias.gr, 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 , Andrew Tropin , Christopher Baines , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Mathieu Othacehe , Nicolas Goaziou , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Andrew Tropin , Christopher Baines , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Mathieu Othacehe , Nicolas Goaziou , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74997-submit@debbugs.gnu.org id=B74997.173471615818422 (code B ref 74997); Fri, 20 Dec 2024 17:36:02 +0000 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:58 +0000 Received: from localhost ([127.0.0.1]:43919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgur-0004n3-Pt for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:58 -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 1tOgun-0004mD-FY for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:54 -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=FNiZV16DVl+v9tOWOXt1Jg/qFHHhOrF/yWnRsJTDfCU=; b=TmpZgGbdg/MG2p2wrI9r8cN1oRlQGEJ9vaclmcvbMbsrjuEL/AJk0TWjBu05ESkPs2z0nQ fgVaz3ZVNKq/zekyUXURrSMCl5TeV/9h3RjEI9URDO7OBVTmeZt3tgFzfAXQ03sZY9g0Nu OkhLkGi9phJ6Bxy5xOIO9pfJsoNKA+2e/WUGHeopa/+2pA4Ppla9P1tcNfW+kgCSGD7P46 76hRGwpIWQDE5qv22FLLSvLj+2rEVut5Nli+D03H51unpqGi4LuSXBr3u98Spcrqdrll4+ 6DuKOr43/Gkl96X5lJ9b2Xjdm+URtlzBjjXBsPkM1tuy4266t83A6Wn0o0EmPw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9f20b1a0 (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:03 +0100 Message-ID: <22e9c6d15adb7a3dca3afb76ba2407c076b94af2.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/elpa.scm: Import (guix utils). * guix/import/texlive.scm: Import (guix utils). * guix/import/utils.scm (downstream-package-name): Move to ... * guix/utils.scm (downstream-package-name): ... here. Change-Id: If56a452f64ed06c8bb06a96a283a5067cb54d602 --- guix/import/elpa.scm | 1 + guix/import/texlive.scm | 1 + guix/import/utils.scm | 9 --------- guix/utils.scm | 9 +++++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index b86a6a546b..62b1d645ac 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -44,6 +44,7 @@ (define-module (guix import elpa) #:use-module (guix git) #:use-module (guix hash) #:use-module (guix store) + #:use-module ((guix utils) #:select (downstream-package-name)) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8ce22a1d59..8e67d11c69 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -35,6 +35,7 @@ (define-module (guix import texlive) #:use-module (guix store) #:use-module (guix svn-download) #:use-module (guix upstream) + #:use-module ((guix utils) #:select (downstream-package-name)) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 popen) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0b1b3b3298..6f5efa790e 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -83,7 +83,6 @@ (define-module (guix import utils) read-lines chunk-lines - downstream-package-name guix-name recursive-import)) @@ -614,14 +613,6 @@ (define* (chunk-lines lines #:optional (pred string-null?)) (reverse res) (loop (cdr after) res)))))) -(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 diff --git a/guix/utils.scm b/guix/utils.scm index 537d0490e0..2d82329cb7 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -91,6 +91,7 @@ (define-module (guix utils) %current-system %current-target-system package-name->name+version + downstream-package-name target-linux? target-hurd? system-hurd? @@ -706,6 +707,14 @@ (define* (package-name->name+version spec (idx (values (substring spec 0 idx) (substring spec (1+ idx)))))) +(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* (target-linux? #:optional (target (or (%current-target-system) (%current-system)))) "Does the operating system of TARGET use the Linux kernel?" From patchwork Fri Dec 20 17:35:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35094 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 CB7EC27BBEA; Fri, 20 Dec 2024 17:36:30 +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=ham 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 8893627BBE2 for ; Fri, 20 Dec 2024 17:36:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOgv6-00070O-6l; Fri, 20 Dec 2024 12:36:12 -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 1tOguz-0006zP-65 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:06 -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 1tOguy-00075a-3i for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:04 -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=PXvJHN2kTOevePUdDaPlGt09v/c5ZE33yCY66SOmjr4=; b=rZ8cFUQ3s3WGwJi8aOCyFEV+eGU/gYr7Byy6UOL7rQmL9wWXPhTk+BB/tfsdPMxEmBnLD1hZIlWyMlrBR4XGXXmXmVdkOz+uVWQwhafMB7a9k72mm7KWEuKLrO7e/LonlrfDhQWv1NG3y3SOaEaVjGrvEGIoH3SiDuZ8PlAGvk50HWYlaw2Mo02Hf8Z7AZKb9bGaWVYP/8OouqoaEir76iIpqSok7kj2UQLomRiGUScseOnqwTkFkWdb9+8g/oD3fpb4qkq8OdoBVQPW4+EKMYYXnzgBTvWTFeLzJzdVbMmaLTK8W8m9RwAAiPyEOv6D4fPT//+t9J4q4XVZYSll+Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOgux-0004ns-5j; Fri, 20 Dec 2024 12:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74997] [PATCH 4/5] gnu: make-arm-trusted-firmware: Use downstream-package-name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 17:36:03 +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: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74997-submit@debbugs.gnu.org id=B74997.173471615918432 (code B ref 74997); Fri, 20 Dec 2024 17:36:03 +0000 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:59 +0000 Received: from localhost ([127.0.0.1]:43921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgus-0004n7-9C for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:58 -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 1tOguo-0004mD-BC for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:54 -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=PXvJHN2kTOevePUdDaPlGt09v/c5ZE33yCY66SOmjr4=; b=CnrR3rb8KE/JzHIKn9nIRaK2FPlOxxN3RtO7YIjpTEb9ncYthF2v26C/DtWx4OryZAtl0U ls1nv3yL25sQEBxHX0Z3aZVo7VycyXIWL0VgjxLycqV/tBRa3hrfjAZp2b2vczmckRJgm3 o/Gbpm/yifjrI88V75DS5HT3Fqx3j6fxngilZhfhVoYfoWoTkOlwR6sqOxISkyNdtOZ/ZO Nbs7U3LPQ12gqqF17dX8ux/bLpsmeLdbweH3CYquKrmiG6qixKSCTpuVYCu/aobUgaP9Xg Li6SY4LqX3ItV6t9mhqh+Ik/Zp9si/h/1u1x2WfF34+R64Bybx2BtL7K8NB9kg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 562dbf05 (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:04 +0100 Message-ID: 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 * gnu/packages/firmware.scm (make-arm-trusted-firmware): Use downstream-package-name. [arguments]: Remove configure phase, use fix-cross-build phase instead. (arm-trusted-firmware-sun50i-a64): Return base package directly. Change-Id: I23f05ac5e8e897037cd8d8afc4e747b05e56e32d --- gnu/packages/firmware.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 89d29b8add..04f138f22c 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1108,7 +1108,7 @@ (define* (make-arm-trusted-firmware platform #:key ;;%current-system is a *triplet*, unlike its name would suggest. (string=? (%current-system) (gnu-triplet->nix-system triplet)))) (package - (name (string-append "arm-trusted-firmware-" platform)) + (name (downstream-package-name "arm-trusted-firmware-" platform)) (version "2.12") (source (origin @@ -1131,7 +1131,7 @@ (define* (make-arm-trusted-firmware platform #:key #:target (and (not (native-build?)) triplet) #:phases #~(modify-phases %standard-phases - (replace 'configure ;no configure script + (add-after 'unpack 'fix-cross-build ;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31 (lambda _ (unless #$(native-build?) @@ -1140,6 +1140,7 @@ (define* (make-arm-trusted-firmware platform #:key (substitute* "make_helpers/build_macros.mk" (("-oc") "-oc-default") (("-od") "-od-default"))))) + (delete 'configure) ;no configure script (replace 'install (lambda _ (for-each (lambda (file) @@ -1171,10 +1172,7 @@ (define* (make-arm-trusted-firmware platform #:key license:bsd-2)))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 - (let ((base (make-arm-trusted-firmware "sun50i_a64"))) - (package - (inherit base) - (name "arm-trusted-firmware-sun50i-a64")))) + (make-arm-trusted-firmware "sun50i_a64")) (define-public arm-trusted-firmware-rk3328 (make-arm-trusted-firmware "rk3328")) From patchwork Fri Dec 20 17:35:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35096 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 7BCB427BBE9; Fri, 20 Dec 2024 17:36:34 +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 72E5C27BBE2 for ; Fri, 20 Dec 2024 17:36:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOgv8-000712-F3; Fri, 20 Dec 2024 12:36:14 -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 1tOguz-0006zQ-6U for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:06 -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 1tOguy-00075b-74 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:04 -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=CIknja4aHFEd5dUDTVdyvbX3Vjd80AxQJuZU5QbpGP4=; b=Yqy5mrUOU3pt/2aHNa+02LMKVlsJ69XxH7q/QGkAUqi9FY+viF8S74XV7I8W2GOqPXt+bucnJDZPNimY9wK9bHLjK7k9AFDqnIZT9K3hiR9gjv15LNRb5taXcEZJG3S/zBcB6n4v6i164V6ZPaBU6EQeWDNnQ54aFArCktaEByrLHM2lvMWeMiqU4W+qulPP2RId6vpBzFqzFRfPrR6oxV8MSb3MNG4PXk+ljop9wE78hVt+NIsoLN4K8tllQWe3rgjVuKBtlyvLLIl/wdO1GMRMNAjQ178D3AMTVmTVyxmEWzGxStlOaqSNGeHIl12oB0PxK1dz3/ynZXYdnb8MlA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOgux-0004o1-QO; Fri, 20 Dec 2024 12:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74997] [PATCH 5/5] gnu: u-boot: Use downstream-package-name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 17:36:03 +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: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74997-submit@debbugs.gnu.org id=B74997.173471615918438 (code B ref 74997); Fri, 20 Dec 2024 17:36:03 +0000 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:59 +0000 Received: from localhost ([127.0.0.1]:43923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOgus-0004nF-SN for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:59 -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 1tOgup-0004mD-8i for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734716147; 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=CIknja4aHFEd5dUDTVdyvbX3Vjd80AxQJuZU5QbpGP4=; b=RS9YLlAv6w54ZCWH1uCoo8nywQZCTBmAaoOuhMscIcwd0D+wVfCWpibuubk5woAwDou4dy /Gxt0aIml3PZ2PHN0LRfNBEDAyelt3EN/MCpu4Ro+l3vXfWPEJFo0BGiWDztfwMWPHlbM1 m1cJkJ3nrMy2xIGjYhPT7RoHVh7EDgw5jnu9nKu27NHnEGYdxQ8HjBdTgorq53Ni698PV3 +ukPLqAioWHBcIS1aqruYCp0XU9KKID152DfFuV/Z9zpICyBsIDt8SyFzSFTQ85q6hu9wj b9k37t8KN2T39P8BRR2uEUdIn3qUCZ5bMIxwL+dNKUIfYIqwxCKP2i+gyRcM4Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c11f5a31 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:47 +0000 (UTC) Date: Fri, 20 Dec 2024 18:35:05 +0100 Message-ID: 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 * gnu/packages/bootloaders.scm (u-boot): Use downstream-package-name. Change-Id: I7226519a676ba201be3a95078112b6514a201731 --- gnu/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3122a185dd..b5cfacca4b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1041,9 +1041,7 @@ (define*-public (make-u-boot-package board triplet (gnu-triplet->nix-system triplet)))))) (package (inherit u-boot) - (name (string-append "u-boot-" - (string-replace-substring (string-downcase board) - "_" "-") + (name (string-append (downstream-package-name "u-boot-" board) (or name-suffix ""))) (description (if append-description (string-append (package-description u-boot)