diff options
| author | Hilton Chain <hako@ultrarare.space> | 2025-11-30 16:53:55 +0800 |
|---|---|---|
| committer | Rutherther <rutherther@ditigal.xyz> | 2026-01-18 11:14:55 +0100 |
| commit | 1232e5352621befc6eefeda0ffec55c5bdf5df64 (patch) | |
| tree | cee564ab89760022c417ebb79421eee1836926d4 | |
| parent | d41f3621145762457af5dd5931fa2935d172a54a (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 c66178ed646..5ba47758020 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 | ;;; |
| @@ -4517,9 +4517,9 @@ | |||
| 4517 | (crate-source "detect-newline-style" "0.1.2" | 4517 | (crate-source "detect-newline-style" "0.1.2" |
| 4518 | "0j9pcjk2ab21f36fqybz69whd1c4xy60hy7qd5v59aqm6rfg490i")) | 4518 | "0j9pcjk2ab21f36fqybz69whd1c4xy60hy7qd5v59aqm6rfg490i")) |
| 4519 | 4519 | ||
| 4520 | (define rust-deunicode-1.6.1 rust-deunicode-1) | 4520 | (define rust-deunicode-1.6.1 package:rust-deunicode-1) |
| 4521 | 4521 | ||
| 4522 | (define rust-deunicode-1.6.2 rust-deunicode-1) | 4522 | (define rust-deunicode-1.6.2 package:rust-deunicode-1) |
| 4523 | 4523 | ||
| 4524 | (define rust-devicons-0.6.12 | 4524 | (define rust-devicons-0.6.12 |
| 4525 | (crate-source "devicons" "0.6.12" | 4525 | (crate-source "devicons" "0.6.12" |
| @@ -8795,7 +8795,7 @@ | |||
| 8795 | (crate-source "hyperlocal" "0.8.0" | 8795 | (crate-source "hyperlocal" "0.8.0" |
| 8796 | "136978rsp0wr6x28cxivxhbq2np66l4jrq3n9xwckrrd5dxxzbqg")) | 8796 | "136978rsp0wr6x28cxivxhbq2np66l4jrq3n9xwckrrd5dxxzbqg")) |
| 8797 | 8797 | ||
| 8798 | (define rust-hypher-0.1.6 rust-hypher-0.1) | 8798 | (define rust-hypher-0.1.6 package:rust-hypher-0.1) |
| 8799 | 8799 | ||
| 8800 | (define rust-hyprland-0.3.13 | 8800 | (define rust-hyprland-0.3.13 |
| 8801 | (crate-source "hyprland" "0.3.13" | 8801 | (crate-source "hyprland" "0.3.13" |
| @@ -10616,9 +10616,9 @@ | |||
| 10616 | (crate-source "libspa" "0.8.0" | 10616 | (crate-source "libspa" "0.8.0" |
| 10617 | "044qs48yl0llp2dmrgwxj9y1pgfy09i6fhq661zqqb9a3fwa9wv5")) | 10617 | "044qs48yl0llp2dmrgwxj9y1pgfy09i6fhq661zqqb9a3fwa9wv5")) |
| 10618 | 10618 | ||
| 10619 | (define rust-libspa-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 10619 | (define rust-libspa-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 10620 | 10620 | ||
| 10621 | (define rust-libspa-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 10621 | (define rust-libspa-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 10622 | 10622 | ||
| 10623 | (define rust-libspa-0.9.2 | 10623 | (define rust-libspa-0.9.2 |
| 10624 | (crate-source "libspa" "0.9.2" | 10624 | (crate-source "libspa" "0.9.2" |
| @@ -10632,9 +10632,9 @@ | |||
| 10632 | (crate-source "libspa-sys" "0.8.0" | 10632 | (crate-source "libspa-sys" "0.8.0" |
| 10633 | "07yh4i5grzbxkchg6dnxlwbdw2wm5jnd7ffbhl77jr0388b9f3dz")) | 10633 | "07yh4i5grzbxkchg6dnxlwbdw2wm5jnd7ffbhl77jr0388b9f3dz")) |
| 10634 | 10634 | ||
| 10635 | (define rust-libspa-sys-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 10635 | (define rust-libspa-sys-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 10636 | 10636 | ||
| 10637 | (define rust-libspa-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 10637 | (define rust-libspa-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 10638 | 10638 | ||
| 10639 | (define rust-libspa-sys-0.9.2 | 10639 | (define rust-libspa-sys-0.9.2 |
| 10640 | ;; TODO: Check bundled sources. | 10640 | ;; TODO: Check bundled sources. |
| @@ -13617,7 +13617,7 @@ | |||
| 13617 | (crate-source "pcre2" "0.2.9" | 13617 | (crate-source "pcre2" "0.2.9" |
| 13618 | "0avb52h3ppw6kp9ynlw988c745am9j7px2cdsm0la10qmi1mrr9v")) | 13618 | "0avb52h3ppw6kp9ynlw988c745am9j7px2cdsm0la10qmi1mrr9v")) |
| 13619 | 13619 | ||
| 13620 | (define rust-pcre2-0.2.9.85b7afb rust-pcre2-utf32-0.2) | 13620 | (define rust-pcre2-0.2.9.85b7afb package:rust-pcre2-utf32-0.2) |
| 13621 | 13621 | ||
| 13622 | (define rust-pcre2-sys-0.2.10 | 13622 | (define rust-pcre2-sys-0.2.10 |
| 13623 | (crate-source "pcre2-sys" "0.2.10" | 13623 | (crate-source "pcre2-sys" "0.2.10" |
| @@ -13629,7 +13629,7 @@ | |||
| 13629 | "12hxy54i8amdnmcm034hqdc7iryd20n8aqg1hw5w540vzcc5s3sm" | 13629 | "12hxy54i8amdnmcm034hqdc7iryd20n8aqg1hw5w540vzcc5s3sm" |
| 13630 | #:snippet '(delete-file-recursively "upstream"))) | 13630 | #:snippet '(delete-file-recursively "upstream"))) |
| 13631 | 13631 | ||
| 13632 | (define rust-pcre2-sys-0.2.9.85b7afb rust-pcre2-utf32-0.2) | 13632 | (define rust-pcre2-sys-0.2.9.85b7afb package:rust-pcre2-utf32-0.2) |
| 13633 | 13633 | ||
| 13634 | (define rust-pcsc-2.9.0 | 13634 | (define rust-pcsc-2.9.0 |
| 13635 | (crate-source "pcsc" "2.9.0" | 13635 | (crate-source "pcsc" "2.9.0" |
| @@ -13945,15 +13945,15 @@ | |||
| 13945 | (crate-source "pipewire" "0.8.0" | 13945 | (crate-source "pipewire" "0.8.0" |
| 13946 | "1nldg1hz4v0qr26lzdxqpvrac4zbc3pb6436sl392425bjx4brh8")) | 13946 | "1nldg1hz4v0qr26lzdxqpvrac4zbc3pb6436sl392425bjx4brh8")) |
| 13947 | 13947 | ||
| 13948 | (define rust-pipewire-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 13948 | (define rust-pipewire-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 13949 | 13949 | ||
| 13950 | (define rust-pipewire-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 13950 | (define rust-pipewire-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 13951 | 13951 | ||
| 13952 | (define rust-pipewire-0.9.2 | 13952 | (define rust-pipewire-0.9.2 |
| 13953 | (crate-source "pipewire" "0.9.2" | 13953 | (crate-source "pipewire" "0.9.2" |
| 13954 | "0i4ddb89cr8x02zqy35krlx5mgkd3mqr0qbwkx4mdmqipydbi24n")) | 13954 | "0i4ddb89cr8x02zqy35krlx5mgkd3mqr0qbwkx4mdmqipydbi24n")) |
| 13955 | 13955 | ||
| 13956 | (define rust-pipewire-sys-0.8.0.93138d0 rust-pipewire-0.8.0.93138d0) | 13956 | (define rust-pipewire-sys-0.8.0.93138d0 package:rust-pipewire-0.8.0.93138d0) |
| 13957 | 13957 | ||
| 13958 | (define rust-pipewire-sys-0.7.2 | 13958 | (define rust-pipewire-sys-0.7.2 |
| 13959 | (crate-source "pipewire-sys" "0.7.2" | 13959 | (crate-source "pipewire-sys" "0.7.2" |
| @@ -13963,7 +13963,7 @@ | |||
| 13963 | (crate-source "pipewire-sys" "0.8.0" | 13963 | (crate-source "pipewire-sys" "0.8.0" |
| 13964 | "04hiy3rl8v3j2dfzp04gr7r8l5azzqqsvqdzwa7sipdij27ii7l4")) | 13964 | "04hiy3rl8v3j2dfzp04gr7r8l5azzqqsvqdzwa7sipdij27ii7l4")) |
| 13965 | 13965 | ||
| 13966 | (define rust-pipewire-sys-0.8.0.fd3d8f7 rust-pipewire-0.8.0.fd3d8f7) | 13966 | (define rust-pipewire-sys-0.8.0.fd3d8f7 package:rust-pipewire-0.8.0.fd3d8f7) |
| 13967 | 13967 | ||
| 13968 | (define rust-pipewire-sys-0.9.2 | 13968 | (define rust-pipewire-sys-0.9.2 |
| 13969 | ;; TODO: Check bundled sources. | 13969 | ;; TODO: Check bundled sources. |
| @@ -14633,7 +14633,7 @@ | |||
| 14633 | (crate-source "ptyprocess" "0.4.1" | 14633 | (crate-source "ptyprocess" "0.4.1" |
| 14634 | "1kz8gzsr2pjpxcxy708338wcdqnxg3cpfbca8q8a44gvpvvsw1by")) | 14634 | "1kz8gzsr2pjpxcxy708338wcdqnxg3cpfbca8q8a44gvpvvsw1by")) |
| 14635 | 14635 | ||
| 14636 | (define rust-pubgrub-0.3.0-alpha.1.b70cf70 rust-pubgrub-0.3.0.b70cf70) | 14636 | (define rust-pubgrub-0.3.0-alpha.1.b70cf70 package:rust-pubgrub-0.3.0.b70cf70) |
| 14637 | 14637 | ||
| 14638 | (define rust-public-api-0.33.1 | 14638 | (define rust-public-api-0.33.1 |
| 14639 | (crate-source "public-api" "0.33.1" | 14639 | (crate-source "public-api" "0.33.1" |
| @@ -15794,8 +15794,8 @@ | |||
| 15794 | (crate-source "rgb" "0.8.52" | 15794 | (crate-source "rgb" "0.8.52" |
| 15795 | "1km115a9lblf9pldvx51dmmg30y8ms4ka67hvas2ndcq556qhshc")) | 15795 | "1km115a9lblf9pldvx51dmmg30y8ms4ka67hvas2ndcq556qhshc")) |
| 15796 | 15796 | ||
| 15797 | (define rust-ring-0.17.8 rust-ring-0.17) | 15797 | (define rust-ring-0.17.8 package:rust-ring-0.17) |
| 15798 | (define rust-ring-0.17.14 rust-ring-0.17) | 15798 | (define rust-ring-0.17.14 package:rust-ring-0.17) |
| 15799 | 15799 | ||
| 15800 | (define rust-ripemd-0.1.3 | 15800 | (define rust-ripemd-0.1.3 |
| 15801 | (crate-source "ripemd" "0.1.3" | 15801 | (crate-source "ripemd" "0.1.3" |
| @@ -17822,9 +17822,9 @@ | |||
| 17822 | (crate-source "smawk" "0.3.2" | 17822 | (crate-source "smawk" "0.3.2" |
| 17823 | "0344z1la39incggwn6nl45k8cbw2x10mr5j0qz85cdz9np0qihxp")) | 17823 | "0344z1la39incggwn6nl45k8cbw2x10mr5j0qz85cdz9np0qihxp")) |
| 17824 | 17824 | ||
| 17825 | (define rust-smithay-0.6.0.ede2707 rust-smithay-0.6.0.ede2707) | 17825 | (define rust-smithay-0.6.0.ede2707 package:rust-smithay-0.6.0.ede2707) |
| 17826 | 17826 | ||
| 17827 | (define rust-smithay-0.7.0.20d2dac rust-smithay-0.7.0.20d2dac) | 17827 | (define rust-smithay-0.7.0.20d2dac package:rust-smithay-0.7.0.20d2dac) |
| 17828 | 17828 | ||
| 17829 | (define rust-smithay-0.7.0.d743e1a | 17829 | (define rust-smithay-0.7.0.d743e1a |
| 17830 | ;; TODO: Define standalone package if this is a workspace. | 17830 | ;; TODO: Define standalone package if this is a workspace. |
| @@ -17839,7 +17839,7 @@ | |||
| 17839 | (crate-source "smithay-client-toolkit" "0.18.1" | 17839 | (crate-source "smithay-client-toolkit" "0.18.1" |
| 17840 | "0fpm2yfpsif7022w4xalxgn53y8w5dc8zkipcpbj1n1vmgpd6bwj")) | 17840 | "0fpm2yfpsif7022w4xalxgn53y8w5dc8zkipcpbj1n1vmgpd6bwj")) |
| 17841 | 17841 | ||
| 17842 | (define rust-smithay-drm-extras-0.1.0.20d2dac rust-smithay-0.7.0.20d2dac) | 17842 | (define rust-smithay-drm-extras-0.1.0.20d2dac package:rust-smithay-0.7.0.20d2dac) |
| 17843 | 17843 | ||
| 17844 | (define rust-smithay-client-toolkit-0.15.4 | 17844 | (define rust-smithay-client-toolkit-0.15.4 |
| 17845 | (crate-source "smithay-client-toolkit" "0.15.4" | 17845 | (crate-source "smithay-client-toolkit" "0.15.4" |
| @@ -17853,7 +17853,7 @@ | |||
| 17853 | (crate-source "smithay-clipboard" "0.7.2" | 17853 | (crate-source "smithay-clipboard" "0.7.2" |
| 17854 | "0inqnr4x458nqz0wdcanbgn77dad3bj0m7pjj074lrv3qkp1d0nc")) | 17854 | "0inqnr4x458nqz0wdcanbgn77dad3bj0m7pjj074lrv3qkp1d0nc")) |
| 17855 | 17855 | ||
| 17856 | (define rust-smithay-drm-extras-0.1.0.ede2707 rust-smithay-0.6.0.ede2707) | 17856 | (define rust-smithay-drm-extras-0.1.0.ede2707 package:rust-smithay-0.6.0.ede2707) |
| 17857 | 17857 | ||
| 17858 | (define rust-smol-str-0.1.24 | 17858 | (define rust-smol-str-0.1.24 |
| 17859 | (crate-source "smol_str" "0.1.24" | 17859 | (crate-source "smol_str" "0.1.24" |
| @@ -18603,9 +18603,9 @@ | |||
| 18603 | (crate-source "synstructure" "0.13.2" | 18603 | (crate-source "synstructure" "0.13.2" |
| 18604 | "1lh9lx3r3jb18f8sbj29am5hm9jymvbwh6jb1izsnnxgvgrp12kj")) | 18604 | "1lh9lx3r3jb18f8sbj29am5hm9jymvbwh6jb1izsnnxgvgrp12kj")) |
| 18605 | 18605 | ||
| 18606 | (define rust-syntect-5.2.0 rust-syntect-5.2) | 18606 | (define rust-syntect-5.2.0 package:rust-syntect-5.2) |
| 18607 | 18607 | ||
| 18608 | (define rust-syntect-5.3.0 rust-syntect-5.3) | 18608 | (define rust-syntect-5.3.0 package:rust-syntect-5.3) |
| 18609 | 18609 | ||
| 18610 | (define rust-sys-info-0.9.1 | 18610 | (define rust-sys-info-0.9.1 |
| 18611 | (crate-source "sys-info" "0.9.1" | 18611 | (crate-source "sys-info" "0.9.1" |
| @@ -20895,7 +20895,7 @@ | |||
| 20895 | (crate-source "version-compare" "0.2.0" | 20895 | (crate-source "version-compare" "0.2.0" |
| 20896 | "12y9262fhjm1wp0aj3mwhads7kv0jz8h168nn5fb8b43nwf9abl5")) | 20896 | "12y9262fhjm1wp0aj3mwhads7kv0jz8h168nn5fb8b43nwf9abl5")) |
| 20897 | 20897 | ||
| 20898 | (define rust-version-ranges-0.1.1.b70cf70 rust-pubgrub-0.3.0.b70cf70) | 20898 | (define rust-version-ranges-0.1.1.b70cf70 package:rust-pubgrub-0.3.0.b70cf70) |
| 20899 | 20899 | ||
| 20900 | (define rust-version-track-0.1.0 | 20900 | (define rust-version-track-0.1.0 |
| 20901 | (crate-source "version-track" "0.1.0" | 20901 | (crate-source "version-track" "0.1.0" |
| @@ -21745,7 +21745,7 @@ | |||
| 21745 | (crate-source "web-time" "1.1.0" | 21745 | (crate-source "web-time" "1.1.0" |
| 21746 | "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras")) | 21746 | "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras")) |
| 21747 | 21747 | ||
| 21748 | (define rust-web-view-0.7.3.82d7cbc rust-web-view-0.7.3.82d7cbc) | 21748 | (define rust-web-view-0.7.3.82d7cbc package:rust-web-view-0.7.3.82d7cbc) |
| 21749 | 21749 | ||
| 21750 | (define rust-webbrowser-1.0.4 | 21750 | (define rust-webbrowser-1.0.4 |
| 21751 | (crate-source "webbrowser" "1.0.4" | 21751 | (crate-source "webbrowser" "1.0.4" |
