From patchwork Sun Mar 23 07:28:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40715 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 C4F4727BBEA; Sun, 23 Mar 2025 07:31:22 +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=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,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 3F10A27BBE2 for ; Sun, 23 Mar 2025 07:31:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twFn3-0001aV-MX; Sun, 23 Mar 2025 03:30:37 -0400 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 1twFmu-0001Tv-62 for guix-patches@gnu.org; Sun, 23 Mar 2025 03:30:28 -0400 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 1twFmt-00005l-SU for guix-patches@gnu.org; Sun, 23 Mar 2025 03:30:27 -0400 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=TGhCgjPyasQzWWazZ0P/MxkxxiwvTcGZxCgKEYHnGwk=; b=fd0dXkY/twlHEOPL5uP2BHLatBEylFb8zlKhXwKiHO/+/BKArW9BxDsBtTrenVFYbJt47M8jbG+i2r5rhRoMxscvRFPW/v6uc2eXgfjzUZeb8EF/lePZ9Q0EVWwHQSt+AQpuVOAKGfdIOH2oUrhNSDZDjkshpyQBvwVwaGK7hvNffEIkQoOSxs5u6lrhipSa4aoWrHjywkhyNqwf5BTn8QRq+32Bv//JT3QR9yxo25nncXZojx6nY/KY4mzjs1x3g0J/BdS1vi8SwBcmM6vFpLAfx/MC2kzFXUo3dIGmKPkGWn2i5FAt1m0PPHsRjhf97WGUQHdS7YdKmrOR3TjOxQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twFms-0004S1-Ph; Sun, 23 Mar 2025 03:30:26 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH rust-team v3 13/17] import: crate: crate-name->package-name: Move to (guix build-system cargo). Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org Resent-Date: Sun, 23 Mar 2025 07:30:26 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77093@debbugs.gnu.org Cc: Hilton Chain , Divya Ranjan Pattanaik , Efraim Flashner , Steve George X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174271500216419 (code B ref 77093); Sun, 23 Mar 2025 07:30:26 +0000 Received: (at 77093) by debbugs.gnu.org; 23 Mar 2025 07:30:02 +0000 Received: from localhost ([127.0.0.1]:47353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twFmS-0004GN-V2 for submit@debbugs.gnu.org; Sun, 23 Mar 2025 03:30:01 -0400 Received: from mx.boiledscript.com ([2a01:4f8:10b:392::42]:54524) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twFmB-0004D3-3w for 77093@debbugs.gnu.org; Sun, 23 Mar 2025 03:29:44 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742714982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wekb04LgqEYpO0enGWr410xsI+L8Mevkj8GM+wk2izw=; b=WA3v9qqN0kE60tiPzOECy1X9NzPnnEx3HGN6qhsUAibEWz7gUKwA3Nj8uFvfneVR6NVxW5 9YzruVwK9EoFtMCvn/uTmPVr5jC+56mejnwr9sNmF8GHXOD45TYylFMRlGscc1UtNVvdCy ofZeJnYfRbIDClZnKUkDPe19v6sepd0FiXtc9Rl8oWawuHW55Nk1w0EQMpaHzXYwg1CXX7 PQ92hZUvVrKROjQOsQVZZazGR6C3pFloLoPWjVEA11FqrHQxAicvYKychoFgNbZib9s92Y nowWQH1pj40QGvn46rTzBfhGjA0kb3M/URG9qKwelZ+KgQXDorWueHHhqg0FMw== Date: Sun, 23 Mar 2025 15:28:35 +0800 Message-ID: <3e476eb8a81e416358acc9fc5cfbd6df0605dd21.1742713356.git.hako@ultrarare.space> 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: , 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/crate.scm (crate-name->package-name): Move to... * guix/build-system/cargo.scm (crate-name->package-name): ...here and export. Change-Id: Ie9813179d6c40d159956cc1e2ae59a74dea0a42d --- guix/build-system/cargo.scm | 6 +++++- guix/import/crate.scm | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 4486c706a1..7a07003262 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -44,7 +44,8 @@ (define-module (guix build-system cargo) %crate-base-url crate-url crate-url? - crate-uri)) + crate-uri + crate-name->package-name)) (define %crate-base-url (make-parameter "https://crates.io")) @@ -58,6 +59,9 @@ (define (crate-uri name version) to NAME and VERSION." (string-append crate-url name "/" version "/download")) +(define (crate-name->package-name name) + (downstream-package-name "rust-" name)) + (define (default-rust target) "Return the default Rust package." ;; Lazily resolve the binding to avoid a circular dependency. diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 5a8caeb3e1..14e6e28c5b 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -481,10 +481,6 @@ (define (guix-package->crate-name package) (match parts ((name _ ...) name)))) -(define (crate-name->package-name name) - (downstream-package-name "rust-" name)) - - ;;; ;;; Updater @@ -528,4 +524,3 @@ (define %crate-updater (description "Updater for crates.io packages") (pred crate-package?) (import import-release))) -