From patchwork Mon Apr 28 16:23:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42108 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 3848B27BC4A; Mon, 28 Apr 2025 17:33:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 B701027BC49 for ; Mon, 28 Apr 2025 17:33:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9RPO-0007eI-8E; Mon, 28 Apr 2025 12:32:44 -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 1u9ROv-0007ay-ML for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:14 -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 1u9ROv-0004OO-At for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:13 -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=QAxpnChm2JQ4iqe4xDL4FBxmR/z+rlOe04Zt7AFhLHk=; b=CKysnoqz8+dJlmtp+ZWacLR9rPYFeFRbzPSiVeOTNdpkTD4hiTdv5HnplC/v1UYoO3y9DPEf3Tc6VhUEblwMTbLvdDquxYhiR/t0XwEZ4Nhd12gQVtKeci56d5TIxfYFHbTM750wcRUTqYIvf3iLv5B+xiRUZVKuAF2AOPfalHUNX/lGyDnTKV2WOS4DkNS9hrRTGFbuH4oqYsGFT8TPWfOfMDhaTjJlEiUqJj3jaVhGp+NZWoXl/1u0QswcjIoxhGEiiVnOKG50J2sLohi/R6pW45nkpMWML2H2CruNQqRqn5mnyWa3wj+DsWMfhoCAcJ2Sh29ezxDtHT1Eq52YbQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9ROu-0003IO-6q; Mon, 28 Apr 2025 12:32:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH v4 rust-team 06/22] 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, hako@ultrarare.space, steve@futurile.net, guix-patches@gnu.org Resent-Date: Mon, 28 Apr 2025 16:32:12 +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 , Hilton Chain , Steve George X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner , Hilton Chain , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174585789812236 (code B ref 77093); Mon, 28 Apr 2025 16:32:12 +0000 Received: (at 77093) by debbugs.gnu.org; 28 Apr 2025 16:31:38 +0000 Received: from localhost ([127.0.0.1]:32833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9ROJ-0003Ar-1y for submit@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:37 -0400 Received: from mail.boiledscript.com ([49.12.134.184]:38426) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9ROB-000395-6B for 77093@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:27 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745857885; 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=nE+TiUjpbomOn4WuvKx7SjXbtAaPuA4qOcRwbH1Mbgs=; b=Gpe5Zf4hGTIKrpBhhIPlDGDOk11p2oFmPBSphsDFhakTCaizXGxmzCrX30lQ5HDSOfL8LQ Tbc+pltArbd2xjiOVbz0gZQ7pYGW9HQsRNuVnk8b2NS/NjATh8Y5JouEvIArnWUgqerey3 VkCYTaZsFEpG/2LrllD1OVFKCNF7/cgbQx83mdZPiirdnwu2hyFQspjA4cvt11gezkE1Ku aMBK7l5T/32uhmi5nPv/soyt50QARNx/Xn9e+f4C1v6CdeKXSntljUoj8lPrIBO/kdXPq3 7cDfNGxqx8sptmlH8NkkeLX14uM25Zow2xPyeXospW7VhzKcb6RoHPTiuqeN5Q== Date: Tue, 29 Apr 2025 00:23:03 +0800 Message-ID: <03977cccf03709eeba4f5aff79ed19bb1beb3a48.1745855744.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 452f7f78d0..f2ffc67879 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))) -