summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guix-cookbook.texi4
-rw-r--r--gnu/packages/rust-crates.scm24
-rw-r--r--guix/import/crate.scm4
-rw-r--r--tests/import/crate.scm4
4 files changed, 17 insertions, 19 deletions
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
index 2107228dbfc..eea1f96bf1b 100644
--- a/doc/guix-cookbook.texi
+++ b/doc/guix-cookbook.texi
@@ -1734,8 +1734,8 @@ At this stage, the package @code{cargo-audit} is buildable.
1734 1734
1735@item 1735@item
1736Finally we'll unbundle the vendored dependencies. The lockfile importer 1736Finally we'll unbundle the vendored dependencies. The lockfile importer
1737inserts @code{TODO:} comments for libraries with high probability of 1737inserts @code{TODO REVIEW:} comments for libraries with high probability
1738bundled dependencies. @code{cargo-build-system} also performs 1738of bundled dependencies. @code{cargo-build-system} also performs
1739additional check for binary files in its 1739additional check for binary files in its
1740@code{check-for-pregenerated-files} phase, which usually indicates 1740@code{check-for-pregenerated-files} phase, which usually indicates
1741bundling: 1741bundling:
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index 5f061f7c1a7..94314513b1f 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -1243,7 +1243,7 @@
1243 "0xxdyn1zcc4jiy0n3bfn56486djbsfd76w0pzn50wlx7s2dlvrsa")) 1243 "0xxdyn1zcc4jiy0n3bfn56486djbsfd76w0pzn50wlx7s2dlvrsa"))
1244 1244
1245(define rust-aws-lc-sys-0.20.1 1245(define rust-aws-lc-sys-0.20.1
1246 ;; TODO: Check bundled sources. 1246 ;; TODO REVIEW: Check bundled sources.
1247 (crate-source "aws-lc-sys" "0.20.1" 1247 (crate-source "aws-lc-sys" "0.20.1"
1248 "00q73wwzbcp9v1sn155d5gajj5ki9mqlpj9d1hj2vbf6529283hg")) 1248 "00q73wwzbcp9v1sn155d5gajj5ki9mqlpj9d1hj2vbf6529283hg"))
1249 1249
@@ -9961,7 +9961,7 @@
9961 "0yp3rz7vrn9mmqdpkds426r1p9vs6i8mkxx8ryqdfadr0s2q0s0q")) 9961 "0yp3rz7vrn9mmqdpkds426r1p9vs6i8mkxx8ryqdfadr0s2q0s0q"))
9962 9962
9963(define rust-js-sys-0.3.76 9963(define rust-js-sys-0.3.76
9964 ;; TODO: Check bundled sources. 9964 ;; TODO REVIEW: Check bundled sources.
9965 (crate-source "js-sys" "0.3.76" 9965 (crate-source "js-sys" "0.3.76"
9966 "1dz7v777h2j38wkf8k5iwkfxskn6nff2cdv2jsslyxkpn2svc5v7")) 9966 "1dz7v777h2j38wkf8k5iwkfxskn6nff2cdv2jsslyxkpn2svc5v7"))
9967 9967
@@ -10295,7 +10295,7 @@
10295 "0ssx5f16hhif8zjdd1fz4cwn1cwjslwcbssm2xs7l93g2i6hw6h0")) 10295 "0ssx5f16hhif8zjdd1fz4cwn1cwjslwcbssm2xs7l93g2i6hw6h0"))
10296 10296
10297(define rust-libbz2-rs-sys-0.2.1 10297(define rust-libbz2-rs-sys-0.2.1
10298 ;; TODO: Check bundled sources. 10298 ;; TODO REVIEW: Check bundled sources.
10299 (crate-source "libbz2-rs-sys" "0.2.1" 10299 (crate-source "libbz2-rs-sys" "0.2.1"
10300 "1jzw1nz25k7b9rbq7czqyvckgxxj90d3bdc020mpravqb06zhnvp")) 10300 "1jzw1nz25k7b9rbq7czqyvckgxxj90d3bdc020mpravqb06zhnvp"))
10301 10301
@@ -10404,7 +10404,7 @@
10404 "0v34vjczpj8hzxnx1nj5cxwf326m91gn7bi3l3zkfg72xij94kvz")) 10404 "0v34vjczpj8hzxnx1nj5cxwf326m91gn7bi3l3zkfg72xij94kvz"))
10405 10405
10406(define rust-libdisplay-info-sys-0.3.0 10406(define rust-libdisplay-info-sys-0.3.0
10407 ;; TODO: Check bundled sources. 10407 ;; TODO REVIEW: Check bundled sources.
10408 (crate-source "libdisplay-info-sys" "0.3.0" 10408 (crate-source "libdisplay-info-sys" "0.3.0"
10409 "07xmkc2aqcdn6d58321y87rd3gzdr4nx3ncm1mmrr7w1p1ahsn96")) 10409 "07xmkc2aqcdn6d58321y87rd3gzdr4nx3ncm1mmrr7w1p1ahsn96"))
10410 10410
@@ -10710,7 +10710,7 @@
10710(define rust-libspa-sys-0.8.0.fd3d8f7 package: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 REVIEW: Check bundled sources.
10714 (crate-source "libspa-sys" "0.9.2" 10714 (crate-source "libspa-sys" "0.9.2"
10715 "1q66vim2wha1rdglqn5w0i42z59pa9s5s8sqj37xxdifbm2lj44h")) 10715 "1q66vim2wha1rdglqn5w0i42z59pa9s5s8sqj37xxdifbm2lj44h"))
10716 10716
@@ -10932,7 +10932,7 @@
10932 "1aq7r2g7786hyxhv40spzf2nhag5xbw2axxc1k8z5k1dsgdm4v6j")) 10932 "1aq7r2g7786hyxhv40spzf2nhag5xbw2axxc1k8z5k1dsgdm4v6j"))
10933 10933
10934(define rust-linux-raw-sys-0.4.5 10934(define rust-linux-raw-sys-0.4.5
10935 ;; TODO: Check bundled sources. 10935 ;; TODO REVIEW: Check bundled sources.
10936 (crate-source "linux-raw-sys" "0.4.5" 10936 (crate-source "linux-raw-sys" "0.4.5"
10937 "00w52pb2cb4b2880ksyzagmzbyjdmp9ac0w3qfvjv3453fnzvg2p")) 10937 "00w52pb2cb4b2880ksyzagmzbyjdmp9ac0w3qfvjv3453fnzvg2p"))
10938 10938
@@ -14059,7 +14059,7 @@
14059(define rust-pipewire-sys-0.8.0.fd3d8f7 package: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 REVIEW: Check bundled sources.
14063 (crate-source "pipewire-sys" "0.9.2" 14063 (crate-source "pipewire-sys" "0.9.2"
14064 "0dpa8q10b9cja5z5r5zgb8q27pnpla7kn3h91c11gjnnw3z8l0nb")) 14064 "0dpa8q10b9cja5z5r5zgb8q27pnpla7kn3h91c11gjnnw3z8l0nb"))
14065 14065
@@ -15681,7 +15681,7 @@
15681 "1glcyqvryv2zj6kjbfji0cldrkincqx3ds3wjwl4qnsnig15wn5w")) 15681 "1glcyqvryv2zj6kjbfji0cldrkincqx3ds3wjwl4qnsnig15wn5w"))
15682 15682
15683(define rust-reflink-0.1.3.e8d93b4 15683(define rust-reflink-0.1.3.e8d93b4
15684 ;; TODO: Define standalone package if this is a workspace. 15684 ;; TODO REVIEW: Define standalone package if this is a workspace.
15685 (origin 15685 (origin
15686 (method git-fetch) 15686 (method git-fetch)
15687 (uri (git-reference (url "https://github.com/nicokoch/reflink") 15687 (uri (git-reference (url "https://github.com/nicokoch/reflink")
@@ -17996,7 +17996,7 @@
17996(define rust-smithay-0.7.0.20d2dac package: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 REVIEW: Define standalone package if this is a workspace.
18000 (origin 18000 (origin
18001 (method git-fetch) 18001 (method git-fetch)
18002 (uri (git-reference (url "https://github.com/Smithay/smithay.git") 18002 (uri (git-reference (url "https://github.com/Smithay/smithay.git")
@@ -19988,7 +19988,7 @@
19988 "1c3jn4ka61l4qw0g8w9lw5l0fwid4wz76x2cvdb3za81a4cp171i")) 19988 "1c3jn4ka61l4qw0g8w9lw5l0fwid4wz76x2cvdb3za81a4cp171i"))
19989 19989
19990(define rust-tracy-client-sys-0.27.0 19990(define rust-tracy-client-sys-0.27.0
19991 ;; TODO: Check bundled sources. 19991 ;; TODO REVIEW: Check bundled sources.
19992 (crate-source "tracy-client-sys" "0.27.0" 19992 (crate-source "tracy-client-sys" "0.27.0"
19993 "07yv23nh5wj6gd7l36ipxg0yr5cgkjzqyqamlybk0as6f2n93crg")) 19993 "07yv23nh5wj6gd7l36ipxg0yr5cgkjzqyqamlybk0as6f2n93crg"))
19994 19994
@@ -21909,12 +21909,12 @@
21909 "15qbbdbhyz02srvm01p0cvlh0pvmbbin9hislp0yx8rvnbs9jfz3")) 21909 "15qbbdbhyz02srvm01p0cvlh0pvmbbin9hislp0yx8rvnbs9jfz3"))
21910 21910
21911(define rust-web-sys-0.3.76 21911(define rust-web-sys-0.3.76
21912 ;; TODO: Check bundled sources. 21912 ;; TODO REVIEW: Check bundled sources.
21913 (crate-source "web-sys" "0.3.76" 21913 (crate-source "web-sys" "0.3.76"
21914 "1g0j3kii20mh7hqmdajz2r4c21zynb9h9h026wymalkx88ip5p84")) 21914 "1g0j3kii20mh7hqmdajz2r4c21zynb9h9h026wymalkx88ip5p84"))
21915 21915
21916(define rust-web-sys-0.3.69 21916(define rust-web-sys-0.3.69
21917 ;; TODO: Check bundled sources. 21917 ;; TODO REVIEW: Check bundled sources.
21918 (crate-source "web-sys" "0.3.69" 21918 (crate-source "web-sys" "0.3.69"
21919 "1vqkxk935xa8zcnsi4bd88sb267ly2i24xl1yiq26d1n32hskbvp")) 21919 "1vqkxk935xa8zcnsi4bd88sb267ly2i24xl1yiq26d1n32hskbvp"))
21920 21920
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index c25a66c644f..1d3dc75de6f 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -300,7 +300,7 @@ referencing all imported sources."
300 (string-append (crate-name->package-name name) "-" version)) 300 (string-append (crate-name->package-name name) "-" version))
301 ,@(if (or (string-suffix? "src" name) 301 ,@(if (or (string-suffix? "src" name)
302 (string-suffix? "sys" name)) 302 (string-suffix? "sys" name))
303 (list (comment ";; TODO: Check bundled sources.\n" #f)) 303 (list (comment ";; TODO REVIEW: Check bundled sources.\n" #f))
304 '()) 304 '())
305 (crate-source ,name ,version 305 (crate-source ,name ,version
306 ,(bytevector->nix-base32-string 306 ,(bytevector->nix-base32-string
@@ -327,7 +327,7 @@ referencing all imported sources."
327 ,(string->symbol 327 ,(string->symbol
328 (string-append (crate-name->package-name name) "-" version)) 328 (string-append (crate-name->package-name name) "-" version))
329 ,(comment 329 ,(comment
330 ";; TODO: Define standalone package if this is a workspace.\n" 330 ";; TODO REVIEW: Define standalone package if this is a workspace.\n"
331 #f) 331 #f)
332 (origin 332 (origin
333 (method git-fetch) 333 (method git-fetch)
diff --git a/tests/import/crate.scm b/tests/import/crate.scm
index d0fa582ad1a..e65609896af 100644
--- a/tests/import/crate.scm
+++ b/tests/import/crate.scm
@@ -311,9 +311,7 @@ version = \"25.2.0\"\n" port)))
311 "aho-corasick" "1.1.3" 311 "aho-corasick" "1.1.3"
312 "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f")) 312 "05mrpkvdgp5d20y2p989f187ry9diliijgwrs254fs9s1m1x6q4f"))
313 (define rust-smithay-0.4.0.0cd3345 313 (define rust-smithay-0.4.0.0cd3345
314 ,($ <comment> 314 ,(? comment?)
315 ";; TODO: Define standalone package if this is a workspace.\n"
316 #f)
317 (origin 315 (origin
318 (method git-fetch) 316 (method git-fetch)
319 (uri (git-reference 317 (uri (git-reference