diff options
| author | Hilton Chain <hako@ultrarare.space> | 2025-11-30 16:53:55 +0800 |
|---|---|---|
| committer | Rutherther <rutherther@ditigal.xyz> | 2026-01-18 10:13:32 +0100 |
| commit | 91f1db61860946e486e6aba2ebd8cc64688f79c8 (patch) | |
| tree | 68c90db64b638ab0976b68fe0806d09671c12df5 | |
| parent | 0fb6feed2c2d346bdab405fd6bad45ac98cd313d (diff) | |
gnu: rust-crates: Add ‘package:’ prefix for replaced crates.
This avoids definitions like
‘(define rust-pipewire-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7)’.
* gnu/packages/rust-crates.scm: Import (gnu packages rust-sources) module with
‘package:’ prefix.
* etc/teams/rust/rust-crates.tmpl,
* doc/guix-cookbook.texi (Cargo Workspaces and Development Snapshots): Adjust
accordingly.
Change-Id: Ie41556d8f30db65e968d8e8238491f1345eeed59
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
| -rw-r--r-- | doc/guix-cookbook.texi | 8 | ||||
| -rw-r--r-- | etc/teams/rust/rust-crates.tmpl | 2 | ||||
| -rw-r--r-- | gnu/packages/rust-crates.scm | 50 |
3 files changed, 30 insertions, 30 deletions
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 4e9e7e1ede7..2107228dbfc 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi | |||
| @@ -1909,11 +1909,11 @@ Don't forget to modify all workspace members in @code{(gnu packages | |||
| 1909 | rust-crates)}: | 1909 | rust-crates)}: |
| 1910 | 1910 | ||
| 1911 | @lisp | 1911 | @lisp |
| 1912 | (define rust-pipewire-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 1912 | (define rust-pipewire-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 1913 | (define rust-pipewire-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 1913 | (define rust-pipewire-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 1914 | @dots{} | 1914 | @dots{} |
| 1915 | (define rust-libspa-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 1915 | (define rust-libspa-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 1916 | (define rust-libspa-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 1916 | (define rust-libspa-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 1917 | @end lisp | 1917 | @end lisp |
| 1918 | 1918 | ||
| 1919 | @node Using Rust Libraries in Other Build Systems | 1919 | @node Using Rust Libraries in Other Build Systems |
diff --git a/etc/teams/rust/rust-crates.tmpl b/etc/teams/rust/rust-crates.tmpl index 5d644580c84..de5685937a4 100644 --- a/etc/teams/rust/rust-crates.tmpl +++ b/etc/teams/rust/rust-crates.tmpl | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #:use-module (guix download) | 22 | #:use-module (guix download) |
| 23 | #:use-module (guix git-download) | 23 | #:use-module (guix git-download) |
| 24 | #:use-module (guix build-system cargo) | 24 | #:use-module (guix build-system cargo) |
| 25 | #:use-module (gnu packages rust-sources) | 25 | #:use-module ((gnu packages rust-sources) #:prefix package:) |
| 26 | #:export (lookup-cargo-inputs)) | 26 | #:export (lookup-cargo-inputs)) |
| 27 | 27 | ||
| 28 | ;;; | 28 | ;;; |
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 7ebba973983..5f061f7c1a7 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #:use-module (guix download) | 22 | #:use-module (guix download) |
| 23 | #:use-module (guix git-download) | 23 | #:use-module (guix git-download) |
| 24 | #:use-module (guix build-system cargo) | 24 | #:use-module (guix build-system cargo) |
| 25 | #:use-module (gnu packages rust-sources) | 25 | #:use-module ((gnu packages rust-sources) #:prefix package:) |
| 26 | #:export (lookup-cargo-inputs)) | 26 | #:export (lookup-cargo-inputs)) |
| 27 | 27 | ||
| 28 | ;;; | 28 | ;;; |
| @@ -4566,9 +4566,9 @@ | |||
| 4566 | (crate-source "detect-newline-style" "0.1.2" | 4566 | (crate-source "detect-newline-style" "0.1.2" |
| 4567 | "0j9pcjk2ab21f36fqybz69whd1c4xy60hy7qd5v59aqm6rfg490i")) | 4567 | "0j9pcjk2ab21f36fqybz69whd1c4xy60hy7qd5v59aqm6rfg490i")) |
| 4568 | 4568 | ||
| 4569 | (define rust-deunicode-1.6.1 rust-deunicode-1) | 4569 | (define rust-deunicode-1.6.1 package:rust-deunicode-1) |
| 4570 | 4570 | ||
| 4571 | (define rust-deunicode-1.6.2 rust-deunicode-1) | 4571 | (define rust-deunicode-1.6.2 package:rust-deunicode-1) |
| 4572 | 4572 | ||
| 4573 | (define rust-devicons-0.6.12 | 4573 | (define rust-devicons-0.6.12 |
| 4574 | (crate-source "devicons" "0.6.12" | 4574 | (crate-source "devicons" "0.6.12" |
| @@ -8860,7 +8860,7 @@ | |||
| 8860 | (crate-source "hyperlocal" "0.8.0" | 8860 | (crate-source "hyperlocal" "0.8.0" |
| 8861 | "136978rsp0wr6x28cxivxhbq2np66l4jrq3n9xwckrrd5dxxzbqg")) | 8861 | "136978rsp0wr6x28cxivxhbq2np66l4jrq3n9xwckrrd5dxxzbqg")) |
| 8862 | 8862 | ||
| 8863 | (define rust-hypher-0.1.6 rust-hypher-0.1) | 8863 | (define rust-hypher-0.1.6 package:rust-hypher-0.1) |
| 8864 | 8864 | ||
| 8865 | (define rust-hyprland-0.3.13 | 8865 | (define rust-hyprland-0.3.13 |
| 8866 | (crate-source "hyprland" "0.3.13" | 8866 | (crate-source "hyprland" "0.3.13" |
| @@ -10689,9 +10689,9 @@ | |||
| 10689 | (crate-source "libspa" "0.8.0" | 10689 | (crate-source "libspa" "0.8.0" |
| 10690 | "044qs48yl0llp2dmrgwxj9y1pgfy09i6fhq661zqqb9a3fwa9wv5")) | 10690 | "044qs48yl0llp2dmrgwxj9y1pgfy09i6fhq661zqqb9a3fwa9wv5")) |
| 10691 | 10691 | ||
| 10692 | (define rust-libspa-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 10692 | (define rust-libspa-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 10693 | 10693 | ||
| 10694 | (define rust-libspa-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 10694 | (define rust-libspa-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 10695 | 10695 | ||
| 10696 | (define rust-libspa-0.9.2 | 10696 | (define rust-libspa-0.9.2 |
| 10697 | (crate-source "libspa" "0.9.2" | 10697 | (crate-source "libspa" "0.9.2" |
| @@ -10705,9 +10705,9 @@ | |||
| 10705 | (crate-source "libspa-sys" "0.8.0" | 10705 | (crate-source "libspa-sys" "0.8.0" |
| 10706 | "07yh4i5grzbxkchg6dnxlwbdw2wm5jnd7ffbhl77jr0388b9f3dz")) | 10706 | "07yh4i5grzbxkchg6dnxlwbdw2wm5jnd7ffbhl77jr0388b9f3dz")) |
| 10707 | 10707 | ||
| 10708 | (define rust-libspa-sys-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 10708 | (define rust-libspa-sys-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 10709 | 10709 | ||
| 10710 | (define rust-libspa-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 10710 | (define rust-libspa-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 10711 | 10711 | ||
| 10712 | (define rust-libspa-sys-0.9.2 | 10712 | (define rust-libspa-sys-0.9.2 |
| 10713 | ;; TODO: Check bundled sources. | 10713 | ;; TODO: Check bundled sources. |
| @@ -13702,7 +13702,7 @@ | |||
| 13702 | (crate-source "pcre2" "0.2.9" | 13702 | (crate-source "pcre2" "0.2.9" |
| 13703 | "0avb52h3ppw6kp9ynlw988c745am9j7px2cdsm0la10qmi1mrr9v")) | 13703 | "0avb52h3ppw6kp9ynlw988c745am9j7px2cdsm0la10qmi1mrr9v")) |
| 13704 | 13704 | ||
| 13705 | (define rust-pcre2-0.2.9.85b7afb rust-pcre2-utf32-0.2) | 13705 | (define rust-pcre2-0.2.9.85b7afb package:rust-pcre2-utf32-0.2) |
| 13706 | 13706 | ||
| 13707 | (define rust-pcre2-sys-0.2.10 | 13707 | (define rust-pcre2-sys-0.2.10 |
| 13708 | (crate-source "pcre2-sys" "0.2.10" | 13708 | (crate-source "pcre2-sys" "0.2.10" |
| @@ -13714,7 +13714,7 @@ | |||
| 13714 | "12hxy54i8amdnmcm034hqdc7iryd20n8aqg1hw5w540vzcc5s3sm" | 13714 | "12hxy54i8amdnmcm034hqdc7iryd20n8aqg1hw5w540vzcc5s3sm" |
| 13715 | #:snippet '(delete-file-recursively "upstream"))) | 13715 | #:snippet '(delete-file-recursively "upstream"))) |
| 13716 | 13716 | ||
| 13717 | (define rust-pcre2-sys-0.2.9.85b7afb rust-pcre2-utf32-0.2) | 13717 | (define rust-pcre2-sys-0.2.9.85b7afb package:rust-pcre2-utf32-0.2) |
| 13718 | 13718 | ||
| 13719 | (define rust-pcsc-2.9.0 | 13719 | (define rust-pcsc-2.9.0 |
| 13720 | (crate-source "pcsc" "2.9.0" | 13720 | (crate-source "pcsc" "2.9.0" |
| @@ -14038,15 +14038,15 @@ | |||
| 14038 | (crate-source "pipewire" "0.8.0" | 14038 | (crate-source "pipewire" "0.8.0" |
| 14039 | "1nldg1hz4v0qr26lzdxqpvrac4zbc3pb6436sl392425bjx4brh8")) | 14039 | "1nldg1hz4v0qr26lzdxqpvrac4zbc3pb6436sl392425bjx4brh8")) |
| 14040 | 14040 | ||
| 14041 | (define rust-pipewire-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 14041 | (define rust-pipewire-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 14042 | 14042 | ||
| 14043 | (define rust-pipewire-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 14043 | (define rust-pipewire-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 14044 | 14044 | ||
| 14045 | (define rust-pipewire-0.9.2 | 14045 | (define rust-pipewire-0.9.2 |
| 14046 | (crate-source "pipewire" "0.9.2" | 14046 | (crate-source "pipewire" "0.9.2" |
| 14047 | "0i4ddb89cr8x02zqy35krlx5mgkd3mqr0qbwkx4mdmqipydbi24n")) | 14047 | "0i4ddb89cr8x02zqy35krlx5mgkd3mqr0qbwkx4mdmqipydbi24n")) |
| 14048 | 14048 | ||
| 14049 | (define rust-pipewire-sys-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 14049 | (define rust-pipewire-sys-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 14050 | 14050 | ||
| 14051 | (define rust-pipewire-sys-0.7.2 | 14051 | (define rust-pipewire-sys-0.7.2 |
| 14052 | (crate-source "pipewire-sys" "0.7.2" | 14052 | (crate-source "pipewire-sys" "0.7.2" |
| @@ -14056,7 +14056,7 @@ | |||
| 14056 | (crate-source "pipewire-sys" "0.8.0" | 14056 | (crate-source "pipewire-sys" "0.8.0" |
| 14057 | "04hiy3rl8v3j2dfzp04gr7r8l5azzqqsvqdzwa7sipdij27ii7l4")) | 14057 | "04hiy3rl8v3j2dfzp04gr7r8l5azzqqsvqdzwa7sipdij27ii7l4")) |
| 14058 | 14058 | ||
| 14059 | (define rust-pipewire-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 14059 | (define rust-pipewire-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 14060 | 14060 | ||
| 14061 | (define rust-pipewire-sys-0.9.2 | 14061 | (define rust-pipewire-sys-0.9.2 |
| 14062 | ;; TODO: Check bundled sources. | 14062 | ;; TODO: Check bundled sources. |
| @@ -14734,7 +14734,7 @@ | |||
| 14734 | (crate-source "ptyprocess" "0.4.1" | 14734 | (crate-source "ptyprocess" "0.4.1" |
| 14735 | "1kz8gzsr2pjpxcxy708338wcdqnxg3cpfbca8q8a44gvpvvsw1by")) | 14735 | "1kz8gzsr2pjpxcxy708338wcdqnxg3cpfbca8q8a44gvpvvsw1by")) |
| 14736 | 14736 | ||
| 14737 | (define rust-pubgrub-0.3.0-alpha.1.b70cf70 rust-pubgrub-0.3.0.b70cf70) | 14737 | (define rust-pubgrub-0.3.0-alpha.1.b70cf70 package:rust-pubgrub-0.3.0.b70cf70) |
| 14738 | 14738 | ||
| 14739 | (define rust-public-api-0.33.1 | 14739 | (define rust-public-api-0.33.1 |
| 14740 | (crate-source "public-api" "0.33.1" | 14740 | (crate-source "public-api" "0.33.1" |
| @@ -15939,8 +15939,8 @@ | |||
| 15939 | (crate-source "rgb" "0.8.52" | 15939 | (crate-source "rgb" "0.8.52" |
| 15940 | "1km115a9lblf9pldvx51dmmg30y8ms4ka67hvas2ndcq556qhshc")) | 15940 | "1km115a9lblf9pldvx51dmmg30y8ms4ka67hvas2ndcq556qhshc")) |
| 15941 | 15941 | ||
| 15942 | (define rust-ring-0.17.8 rust-ring-0.17) | 15942 | (define rust-ring-0.17.8 package:rust-ring-0.17) |
| 15943 | (define rust-ring-0.17.14 rust-ring-0.17) | 15943 | (define rust-ring-0.17.14 package:rust-ring-0.17) |
| 15944 | 15944 | ||
| 15945 | (define rust-ripemd-0.1.3 | 15945 | (define rust-ripemd-0.1.3 |
| 15946 | (crate-source "ripemd" "0.1.3" | 15946 | (crate-source "ripemd" "0.1.3" |
| @@ -17991,9 +17991,9 @@ | |||
| 17991 | (crate-source "smawk" "0.3.2" | 17991 | (crate-source "smawk" "0.3.2" |
| 17992 | "0344z1la39incggwn6nl45k8cbw2x10mr5j0qz85cdz9np0qihxp")) | 17992 | "0344z1la39incggwn6nl45k8cbw2x10mr5j0qz85cdz9np0qihxp")) |
| 17993 | 17993 | ||
| 17994 | (define rust-smithay-0.6.0.ede2707 rust-smithay-0.6.0.ede2707) | 17994 | (define rust-smithay-0.6.0.ede2707 package:rust-smithay-0.6.0.ede2707) |
| 17995 | 17995 | ||
| 17996 | (define rust-smithay-0.7.0.20d2dac rust-smithay-0.7.0.20d2dac) | 17996 | (define rust-smithay-0.7.0.20d2dac package:rust-smithay-0.7.0.20d2dac) |
| 17997 | 17997 | ||
| 17998 | (define rust-smithay-0.7.0.d743e1a | 17998 | (define rust-smithay-0.7.0.d743e1a |
| 17999 | ;; TODO: Define standalone package if this is a workspace. | 17999 | ;; TODO: Define standalone package if this is a workspace. |
| @@ -18008,7 +18008,7 @@ | |||
| 18008 | (crate-source "smithay-client-toolkit" "0.18.1" | 18008 | (crate-source "smithay-client-toolkit" "0.18.1" |
| 18009 | "0fpm2yfpsif7022w4xalxgn53y8w5dc8zkipcpbj1n1vmgpd6bwj")) | 18009 | "0fpm2yfpsif7022w4xalxgn53y8w5dc8zkipcpbj1n1vmgpd6bwj")) |
| 18010 | 18010 | ||
| 18011 | (define rust-smithay-drm-extras-0.1.0.20d2dac rust-smithay-0.7.0.20d2dac) | 18011 | (define rust-smithay-drm-extras-0.1.0.20d2dac package:rust-smithay-0.7.0.20d2dac) |
| 18012 | 18012 | ||
| 18013 | (define rust-smithay-client-toolkit-0.15.4 | 18013 | (define rust-smithay-client-toolkit-0.15.4 |
| 18014 | (crate-source "smithay-client-toolkit" "0.15.4" | 18014 | (crate-source "smithay-client-toolkit" "0.15.4" |
| @@ -18022,7 +18022,7 @@ | |||
| 18022 | (crate-source "smithay-clipboard" "0.7.2" | 18022 | (crate-source "smithay-clipboard" "0.7.2" |
| 18023 | "0inqnr4x458nqz0wdcanbgn77dad3bj0m7pjj074lrv3qkp1d0nc")) | 18023 | "0inqnr4x458nqz0wdcanbgn77dad3bj0m7pjj074lrv3qkp1d0nc")) |
| 18024 | 18024 | ||
| 18025 | (define rust-smithay-drm-extras-0.1.0.ede2707 rust-smithay-0.6.0.ede2707) | 18025 | (define rust-smithay-drm-extras-0.1.0.ede2707 package:rust-smithay-0.6.0.ede2707) |
| 18026 | 18026 | ||
| 18027 | (define rust-smol-str-0.1.24 | 18027 | (define rust-smol-str-0.1.24 |
| 18028 | (crate-source "smol_str" "0.1.24" | 18028 | (crate-source "smol_str" "0.1.24" |
| @@ -18772,9 +18772,9 @@ | |||
| 18772 | (crate-source "synstructure" "0.13.2" | 18772 | (crate-source "synstructure" "0.13.2" |
| 18773 | "1lh9lx3r3jb18f8sbj29am5hm9jymvbwh6jb1izsnnxgvgrp12kj")) | 18773 | "1lh9lx3r3jb18f8sbj29am5hm9jymvbwh6jb1izsnnxgvgrp12kj")) |
| 18774 | 18774 | ||
| 18775 | (define rust-syntect-5.2.0 rust-syntect-5.2) | 18775 | (define rust-syntect-5.2.0 package:rust-syntect-5.2) |
| 18776 | 18776 | ||
| 18777 | (define rust-syntect-5.3.0 rust-syntect-5.3) | 18777 | (define rust-syntect-5.3.0 package:rust-syntect-5.3) |
| 18778 | 18778 | ||
| 18779 | (define rust-sys-info-0.9.1 | 18779 | (define rust-sys-info-0.9.1 |
| 18780 | (crate-source "sys-info" "0.9.1" | 18780 | (crate-source "sys-info" "0.9.1" |
| @@ -21092,7 +21092,7 @@ | |||
| 21092 | (crate-source "version-compare" "0.2.0" | 21092 | (crate-source "version-compare" "0.2.0" |
| 21093 | "12y9262fhjm1wp0aj3mwhads7kv0jz8h168nn5fb8b43nwf9abl5")) | 21093 | "12y9262fhjm1wp0aj3mwhads7kv0jz8h168nn5fb8b43nwf9abl5")) |
| 21094 | 21094 | ||
| 21095 | (define rust-version-ranges-0.1.1.b70cf70 rust-pubgrub-0.3.0.b70cf70) | 21095 | (define rust-version-ranges-0.1.1.b70cf70 package:rust-pubgrub-0.3.0.b70cf70) |
| 21096 | 21096 | ||
| 21097 | (define rust-version-track-0.1.0 | 21097 | (define rust-version-track-0.1.0 |
| 21098 | (crate-source "version-track" "0.1.0" | 21098 | (crate-source "version-track" "0.1.0" |
| @@ -21942,7 +21942,7 @@ | |||
| 21942 | (crate-source "web-time" "1.1.0" | 21942 | (crate-source "web-time" "1.1.0" |
| 21943 | "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras")) | 21943 | "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras")) |
| 21944 | 21944 | ||
| 21945 | (define rust-web-view-0.7.3.82d7cbc rust-web-view-0.7.3.82d7cbc) | 21945 | (define rust-web-view-0.7.3.82d7cbc package:rust-web-view-0.7.3.82d7cbc) |
| 21946 | 21946 | ||
| 21947 | (define rust-webbrowser-1.0.4 | 21947 | (define rust-webbrowser-1.0.4 |
| 21948 | (crate-source "webbrowser" "1.0.4" | 21948 | (crate-source "webbrowser" "1.0.4" |
