[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#77093] [PATCH rust-team 14/18] import: crate: crate-name->package-n
From: |
Hilton Chain |
Subject: |
[bug#77093] [PATCH rust-team 14/18] import: crate: crate-name->package-name: Move to (guix build-system cargo). |
Date: |
Tue, 18 Mar 2025 15:24:27 +0800 |
* 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)))
-
--
2.48.1
- [bug#77093] [PATCH rust-team 06/18] build/cargo: Don't try to unpack sanity-check.py., (continued)
- [bug#77093] [PATCH rust-team 06/18] build/cargo: Don't try to unpack sanity-check.py., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 08/18] build/cargo: Use system jemalloc., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 09/18] scripts: import: Document argument for ‘--insert’ option in help message., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 10/18] scripts: import: Add two newlines for ‘--insert’ option., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 12/18] scripts: import: Pass "--insert" to importers., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 13/18] scripts: import: Skip existing definition for ‘--insert’ option., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 14/18] import: crate: crate-name->package-name: Move to (guix build-system cargo).,
Hilton Chain <=
- [bug#77093] [PATCH rust-team 15/18] build-system: cargo: Add ‘cargo-inputs’., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 11/18] scripts: import: Support expressions defined by 'define., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 16/18] import: crate: Add Cargo.lock parser., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 17/18] import: crate: Add ‘--lockfile’ option., Hilton Chain, 2025/03/18
- [bug#77093] [PATCH rust-team 18/18] doc: Document lockfile importer based Rust packaging workflow., Hilton Chain, 2025/03/18