From patchwork Tue Mar 18 07:24:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 40315 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 5B1E827BBE2; Tue, 18 Mar 2025 07:27:51 +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 CA70D27BBE9 for ; Tue, 18 Mar 2025 07:27:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tuRMT-0007jq-BC; Tue, 18 Mar 2025 03:27:41 -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 1tuRMK-0007eV-Mh for guix-patches@gnu.org; Tue, 18 Mar 2025 03:27:36 -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 1tuRM5-0001Um-Lq for guix-patches@gnu.org; Tue, 18 Mar 2025 03:27:30 -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=s7xZt4cQLBfnnSWkcwL6+4CaT6WsRgs4zxV7rKgM8RE=; b=OrjGj9Dje65tmDcbMpHPg3Dn+IkfWrE1WDGKOzkHdsauQzj99dk0nsvARCCEouLH7K8GmKDpfVsE+Yz0C6z4kqpmGwCgSqtGmVfw2cb93nhQvUD0eZj/fsnAORY/FPpDn4H/FgZSoWo0EFm/9kt2nOLAjZ2xBQNtVu/zgBj6UQ7FnwEynXaHSqp6wQ26eMx1VmK2B0leu9f9XEn/CQv3l4VN4RMu/G2C9gV65BfZBUxfHX69h+A/+jPwh/CF0exbLlSCcnD7tmgtZH9j7hgU2S0tU4PHdOHw7Q8WXF6uotyPL7kE/QcE3IVKKuC7IhVKmF3zj4EH0PBl23TOqY+mwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tuRM3-0004qy-Lo; Tue, 18 Mar 2025 03:27:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH rust-team 14/18] import: crate: crate-name->package-name: Move to (guix build-system cargo). Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, divya@subvertising.org, efraim@flashner.co.il, steve@futurile.net, guix-patches@gnu.org Resent-Date: Tue, 18 Mar 2025 07:27:15 +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 , Hilton Chain , Divya Ranjan Pattanaik , Efraim Flashner , Steve George X-Debbugs-Original-Xcc: Hilton Chain , Divya Ranjan Pattanaik , Efraim Flashner , Steve George Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174228281318356 (code B ref 77093); Tue, 18 Mar 2025 07:27:15 +0000 Received: (at 77093) by debbugs.gnu.org; 18 Mar 2025 07:26:53 +0000 Received: from localhost ([127.0.0.1]:35937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuRLg-0004ld-4Q for submit@debbugs.gnu.org; Tue, 18 Mar 2025 03:26:53 -0400 Received: from mx.boiledscript.com ([88.99.243.112]:51946) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuRLB-0004ga-M4 for 77093@debbugs.gnu.org; Tue, 18 Mar 2025 03:26:22 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1742282780; 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=geOOtBEsBNx2ONmmiPLL/kMPcijDpsDJ3ulRZK3Fa/w=; b=QoSgfQxe8jPxOCzGdRxFZC7CqABcXmrCV2O931V0FaSaosD7lcXjtzGcj3EyBxNPnRB1mk l4hEYrvRNU6EDgGgbt6lQ8lLuVvJBQRLvWPcZmgDlKbzpxFjr2j/7pZ5UszNhmygj/uDcj w09SIdNT/RKta2VPK68cAeD0SvDxFWV9Cm+5dtJj8zfAaMr8OOX4RsuUO/c/IhOKIk4cI+ Pe872gbJI61o5yMzibn7hAyAsKKbD1VnOjNWhe6E7HTfoInYoS/58KnGAJkds/QZG6f3+e 8S9qtXo/z8YJE1qEnFQ1RHKRrY2U2Nmm3HyePNz62Oip8q+OZ79njce66WgWLA== Date: Tue, 18 Mar 2025 15:24:27 +0800 Message-ID: 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))) -