From fb04d0139e4415e9e6c89c5fb72618b8d80b94bb Mon Sep 17 00:00:00 2001 From: Fries Date: Mon, 24 Jul 2023 05:36:30 +0000 Subject: gnu: Add rust-1.69. * gnu/packages/rust.scm (rust-1.69): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/rust.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 38db41549a..ca34231803 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Jim Newsome ;;; Copyright © 2022 Mark H Weaver +;;; Copyright © 2023 Fries ;;; ;;; This file is part of GNU Guix. ;;; @@ -706,6 +707,25 @@ safety and thread safety guarantees.") (rust-bootstrapped-package rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk")) +(define rust-1.69 + (let ((base-rust + (rust-bootstrapped-package + rust-1.68 "1.69.0" + "03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5dcwc9f1gv"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$"))))))))) + ;;; Note: Only the latest version of Rust is supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time -- cgit v1.2.3 From 299a223835f875c9fcb526a76bbe0b7f32cbefaf Mon Sep 17 00:00:00 2001 From: Fries Date: Mon, 18 Sep 2023 15:19:49 +0300 Subject: gnu: Add rust-1.70. * gnu/packages/rust.scm (rust-1.70): New variable. * gnu/packages/patches/rust-1.70-fix-rustix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + .../patches/rust-1.70-fix-rustix-build.patch | 21 +++++++++++++++++++++ gnu/packages/rust.scm | 17 +++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/rust-1.70-fix-rustix-build.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index daacd786a7..bf7cfbf8bd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1947,6 +1947,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-nokogiri.patch \ %D%/packages/patches/rustc-1.54.0-src.patch \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ + %D%/packages/patches/rust-1.70-fix-rustix-build.patch \ %D%/packages/patches/rust-ring-0.16-missing-files.patch \ %D%/packages/patches/rust-ring-0.16-test-files.patch \ %D%/packages/patches/i3status-rust-enable-unstable-features.patch \ diff --git a/gnu/packages/patches/rust-1.70-fix-rustix-build.patch b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch new file mode 100644 index 0000000000..d72a8fb07a --- /dev/null +++ b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch @@ -0,0 +1,21 @@ +@@ -0,0 +1,20 @@ +--- a/vendor/fd-lock/Cargo.toml 2023-05-31 14:44:48.000000000 -0700 ++++ b/vendor/fd-lock/Cargo.toml 2023-07-14 21:19:34.637702319 -0700 +@@ -45,7 +45,7 @@ + + [target."cfg(unix)".dependencies.rustix] + version = "0.37.0" +-features = ["fs"] ++features = ["fs", "cc"] + + [target."cfg(windows)".dependencies.windows-sys] + version = "0.45.0" +--- a/src/bootstrap/Cargo.lock 2023-07-11 20:32:40.000000000 -0700 ++++ b/src/bootstrap/Cargo.lock 2023-07-14 22:41:53.269284713 -0700 +@@ -618,6 +618,7 @@ + dependencies = [ + "bitflags", ++ "cc", + "errno", + "io-lifetimes", + "libc", diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ca34231803..f0e921375b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -726,6 +726,23 @@ safety and thread safety guarantees.") (for-each delete-file (find-files "vendor" "\\.(a|dll|exe|lib)$"))))))))) +(define rust-1.70 + (let ((base-rust + (rust-bootstrapped-package + rust-1.69 "1.70.0" + "0z6j7d0ni0rmfznv0w3mrf882m11kyh51g2bxkj40l3s1c0axgxj"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + ;; Rust 1.70 adds the rustix library which depends on the vendored + ;; fd-lock crate. The fd-lock crate uses Outline assembly which expects + ;; a precompiled static library. Enabling the "cc" feature tells the + ;; build.rs script to compile the assembly files instead of searching + ;; for a precompiled library. + (patches (search-patches "rust-1.70-fix-rustix-build.patch"))))))) + ;;; Note: Only the latest version of Rust is supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time -- cgit v1.2.3 From 839f16dbee6cd0a4511f0f40cc9edab857697f87 Mon Sep 17 00:00:00 2001 From: Fries Date: Mon, 24 Jul 2023 05:36:47 +0000 Subject: gnu: rust: Add make-ignore-test-list function. A little helper function to make creating a list to ignore tests easier. * gnu/packages/rust.scm (make-ignore-test-list): New function. Signed-off-by: Efraim Flashner --- gnu/packages/rust.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f0e921375b..d5481ced23 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -743,6 +743,12 @@ safety and thread safety guarantees.") ;; for a precompiled library. (patches (search-patches "rust-1.70-fix-rustix-build.patch"))))))) +(define (make-ignore-test-list strs) + "Function to make creating a list to ignore tests a bit easier." + (map (lambda (str) + `((,str) (string-append "#[ignore]\n" ,str))) + strs)) + ;;; Note: Only the latest version of Rust is supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time -- cgit v1.2.3 From 14d87c382765d832ee526108e56c69750f77728c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Sep 2023 23:43:47 +0300 Subject: gnu: rust: Update to 1.70.0. * gnu/packages/rust.scm (rust): Update to 1.70.0. [arguments]: Remove 'patch-cargo-env-shebang phase. Adjust custom phases 'disable-tests-requiring-git, disable-tests-requiring-mercurial, 'patch-command-uid-gid-test for changes in the source. Simplify custom phases 'disable-tests-broken-on-aarch64, 'patch-process-tests, 'patch-command-exec-tests, 'disable-interrupt-tests. --- gnu/packages/rust.scm | 98 +++++++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 57 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d5481ced23..6ee57ac21f 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -757,7 +757,7 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.68)) + (let ((base-rust rust-1.70)) (package (inherit base-rust) (outputs (cons "rustfmt" (package-outputs base-rust))) @@ -781,52 +781,36 @@ safety and thread safety guarantees.") (substitute* "src/tools/compiletest/src/runtest.rs" (("\"-nx\".as_ref\\(\\), ") "")))) - (add-after 'unpack 'patch-cargo-env-shebang - (lambda _ - (substitute* '("src/tools/cargo/tests/testsuite/build.rs" - "src/tools/cargo/tests/testsuite/fix.rs") - ;; The cargo *_wrapper tests set RUSTC.*WRAPPER environment - ;; variable which points to /usr/bin/env. Since it's not a - ;; shebang, it needs to be manually patched. - (("/usr/bin/env") - (which "env"))))) (add-after 'unpack 'disable-tests-requiring-git (lambda _ - (substitute* "src/tools/cargo/tests/testsuite/new.rs" - (("fn author_prefers_cargo") - "#[ignore]\nfn author_prefers_cargo") - (("fn finds_author_git") - "#[ignore]\nfn finds_author_git") - (("fn finds_local_author_git") - "#[ignore]\nfn finds_local_author_git")))) + (substitute* "src/tools/cargo/tests/testsuite/git.rs" + ,@(make-ignore-test-list + '("fn fetch_downloads_with_git2_first_"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ - (substitute* - "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs" - (("fn simple_hg_ignore_exists") - "#[ignore]\nfn simple_hg_ignore_exists")) - (substitute* - "src/tools/cargo/tests/testsuite/init/mercurial_autodetect/mod.rs" - (("fn mercurial_autodetect") - "#[ignore]\nfn mercurial_autodetect")))) + (with-directory-excursion "src/tools/cargo/tests/testsuite/init" + (substitute* '("mercurial_autodetect/mod.rs" + "simple_hg_ignore_exists/mod.rs") + ,@(make-ignore-test-list + '("fn case")))))) (add-after 'unpack 'disable-tests-broken-on-aarch64 (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/" (substitute* "build_script_extra_link_arg.rs" - (("^fn build_script_extra_link_arg_bin_single" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn build_script_extra_link_arg_bin_single"))) (substitute* "build_script.rs" - (("^fn env_test" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn env_test"))) (substitute* "collisions.rs" - (("^fn collision_doc_profile_split" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn collision_doc_profile_split"))) (substitute* "concurrent.rs" - (("^fn no_deadlock_with_git_dependencies" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn no_deadlock_with_git_dependencies"))) (substitute* "features2.rs" - (("^fn dep_with_optional_host_deps_activated" m) - (string-append "#[ignore]\n" m)))))) + ,@(make-ignore-test-list + '("fn dep_with_optional_host_deps_activated")))))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where @@ -834,16 +818,14 @@ safety and thread safety guarantees.") ;; since we don't have `echo` available at its usual FHS ;; location. (lambda _ - (substitute* (match (find-files "." "^command-exec.rs$") - ((file) file)) + (substitute* "tests/ui/command/command-exec.rs" (("Command::new\\(\"echo\"\\)") (format #f "Command::new(~s)" (which "echo")))))) (add-after 'unpack 'patch-command-uid-gid-test (lambda _ - (substitute* (match (find-files "." "^command-uid-gid.rs$") - ((file) file)) - (("/bin/sh") - (which "sh"))))) + (substitute* "tests/ui/command/command-uid-gid.rs" + (("/bin/sh") (which "sh")) + (("/bin/ls") (which "ls"))))) (add-after 'unpack 'skip-shebang-tests ;; This test make sure that the parser behaves properly when a ;; source file starts with a shebang. Unfortunately, the @@ -855,26 +837,28 @@ safety and thread safety guarantees.") (add-after 'unpack 'patch-process-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) - (substitute* "library/std/src/process/tests.rs" - (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\""))) - ;; The three tests which are known to fail upstream on QEMU - ;; emulation on aarch64 and riscv64 also fail on x86_64 in Guix's - ;; build system. Skip them on all builds. - (substitute* "library/std/src/sys/unix/process/process_common/tests.rs" - (("target_arch = \"arm\",") "target_os = \"linux\","))))) + (with-directory-excursion "library/std/src" + (substitute* "process/tests.rs" + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\""))) + ;; The three tests which are known to fail upstream on QEMU + ;; emulation on aarch64 and riscv64 also fail on x86_64 in + ;; Guix's build system. Skip them on all builds. + (substitute* "sys/unix/process/process_common/tests.rs" + ,@(make-ignore-test-list + '("fn test_process_mask" + "fn test_process_group_posix_spawn" + "fn test_process_group_no_posix_spawn"))))))) (add-after 'unpack 'disable-interrupt-tests (lambda _ ;; This test hangs in the build container; disable it. - (substitute* (match (find-files "." "^freshness.rs$") - ((file) file)) - (("fn linking_interrupted") - "#[ignore]\nfn linking_interrupted")) + (substitute* "src/tools/cargo/tests/testsuite/freshness.rs" + ,@(make-ignore-test-list + '("fn linking_interrupted"))) ;; Likewise for the ctrl_c_kills_everyone test. - (substitute* (match (find-files "." "^death.rs$") - ((file) file)) - (("fn ctrl_c_kills_everyone") - "#[ignore]\nfn ctrl_c_kills_everyone")))) + (substitute* "src/tools/cargo/tests/testsuite/death.rs" + ,@(make-ignore-test-list + '("fn ctrl_c_kills_everyone"))))) (add-after 'unpack 'adjust-rpath-values ;; This adds %output:out to rpath, allowing us to install utilities in ;; different outputs while reusing the shared libraries. -- cgit v1.2.3 From f5907db6eb4c17b6d6c92edd1e95a40aae831dc3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Sep 2023 23:47:43 +0300 Subject: gnu: rust-rustix-0.37: Remove precompiled files. * gnu/packages/crates-io.scm (rust-rustix-0.37)[source]: Add snippet to remove precompiled files and to not require them while building the package. (rust-rustix-0.36, rust-rustix-0.35): Inherit changes from rust-rustix-0.37. --- gnu/packages/crates-io.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e8f66602c..8bc27c9eec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56869,7 +56869,24 @@ rustc compiler.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c")))) + "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c")) + (snippet + #~(begin + (use-modules (guix build utils)) + (for-each delete-file (find-files "." "\\.a$")) + (delete-file "Cargo.toml") + (substitute* "Cargo.toml.orig" + ;; Depend unconditionally on the cc crate + (("(cc = .*), optional = true.*" _ cc) + (string-append cc " }\n")) + ;; Disable using the linux_raw backend + (("not\\(rustic_use_libc\\)") "miri")) + (substitute* "build.rs" + ;; Always use the 'feature = "cc"' path + (("not\\(feature = \"cc\"\\)") "feature = \"foobar\"") + (("#\\[cfg\\(feature = \"cc\"\\)\\]" all) + (string-append "//" all))) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -56908,6 +56925,7 @@ rustc compiler.") (name "rust-rustix") (version "0.36.13") (source (origin + (inherit (package-source rust-rustix-0.37)) (method url-fetch) (uri (crate-uri "rustix" version)) (file-name (string-append name "-" version ".tar.gz")) @@ -56945,6 +56963,7 @@ rustc compiler.") (name "rust-rustix") (version "0.35.13") (source (origin + (inherit (package-source rust-rustix-0.36)) (method url-fetch) (uri (crate-uri "rustix" version)) (file-name (string-append name "-" version ".tar.gz")) -- cgit v1.2.3 From 868d17acf79302f04e9ead1ff7bed35a76a14885 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 Sep 2023 23:59:22 +0300 Subject: gnu: rust-fd-lock-3: Update to 3.0.12. * gnu/packages/crates-io.scm (rust-fd-lock-3): Update to 3.0.12. [arguments]: Don't skip build. [cargo-inputs]: Add rust-rustix-0.37, rust-windows-sys-0.48. Remove rust-libc-0.2, rust-winapi-0.3. [cargo-development-inputs]: Add rust-tempfile-3. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8bc27c9eec..a1a162f131 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23920,21 +23920,22 @@ floats.") (define-public rust-fd-lock-3 (package (name "rust-fd-lock") - (version "3.0.0") + (version "3.0.12") (source (origin (method url-fetch) (uri (crate-uri "fd-lock" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dif8wk9xrqkjyfgqqy3zfg4ckmkpyzzk5p5m01s99q63bcnv05q")))) + (base32 "0hlnn1302p37qlc9xl2k5y0vw8q8id5kg59an6riy89hjlynpbir")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-rustix" ,rust-rustix-0.37) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/yoshuawuyts/fd-lock") (synopsis "Advisory lock on a file") (description -- cgit v1.2.3 From df93d8a9f85be9ad4902711afca432ae6396087c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 10:49:07 +0300 Subject: gnu: rust: Build more tools. * gnu/packages/rust.scm (rust)[outputs]: Rename 'rustfmt' output to 'tools'. [arguments]: Adjust 'build, 'check and 'install phases to also provide clippy and rust-analyzer. --- gnu/packages/rust.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 6ee57ac21f..34511f283e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -760,7 +760,7 @@ safety and thread safety guarantees.") (let ((base-rust rust-1.70)) (package (inherit base-rust) - (outputs (cons "rustfmt" (package-outputs base-rust))) + (outputs (cons "tools" (package-outputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:tests? _ #f) @@ -878,18 +878,20 @@ safety and thread safety guarantees.") (string-append all "gdb = \"" gdb "/bin/gdb\"\n")))))) (replace 'build - ;; Phase overridden to also build rustfmt. + ;; Phase overridden to also build more tools. (lambda* (#:key parallel-build? #:allow-other-keys) (let ((job-spec (string-append "-j" (if parallel-build? (number->string (parallel-job-count)) "1")))) (invoke "./x.py" job-spec "build" - "library/std" ;rustc + "library/std" ;rustc "src/tools/cargo" + "src/tools/clippy" + "src/tools/rust-analyzer" "src/tools/rustfmt")))) (replace 'check - ;; Phase overridden to also test rustfmt. + ;; Phase overridden to also test more tools. (lambda* (#:key tests? parallel-build? #:allow-other-keys) (when tests? (let ((job-spec (string-append @@ -899,9 +901,11 @@ safety and thread safety guarantees.") (invoke "./x.py" job-spec "test" "-vv" "library/std" "src/tools/cargo" + "src/tools/clippy" + "src/tools/rust-analyzer" "src/tools/rustfmt"))))) (replace 'install - ;; Phase overridden to also install rustfmt. + ;; Phase overridden to also install more tools. (lambda* (#:key outputs #:allow-other-keys) (invoke "./x.py" "install") (substitute* "config.toml" @@ -910,9 +914,11 @@ safety and thread safety guarantees.") (format #f "prefix = ~s" (assoc-ref outputs "cargo")))) (invoke "./x.py" "install" "cargo") (substitute* "config.toml" - ;; Adjust the prefix to the 'rustfmt' output. + ;; Adjust the prefix to the 'tools' output. (("prefix = \"[^\"]*\"") - (format #f "prefix = ~s" (assoc-ref outputs "rustfmt")))) + (format #f "prefix = ~s" (assoc-ref outputs "tools")))) + (invoke "./x.py" "install" "clippy") + (invoke "./x.py" "install" "rust-analyzer") (invoke "./x.py" "install" "rustfmt"))))))) ;; Add test inputs. (native-inputs (cons* `("gdb" ,gdb/pinned) -- cgit v1.2.3 From 24eacc88cd4c975127c511c359840ecaa56f1b60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:11:50 +0300 Subject: gnu: Add rust-cairo-rs-0.17. * gnu/packages/crates-gtk.scm (rust-cairo-rs-0.17): New variable. (rust-cairo-rs-0.15): Inherit from rust-cairo-rs-0.17. --- gnu/packages/crates-gtk.scm | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 1bd61d7f19..e50dbb0cef 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -168,28 +168,30 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-cairo-rs-0.15 +(define-public rust-cairo-rs-0.17 (package (name "rust-cairo-rs") - (version "0.15.12") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "cairo-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7")))) + (base32 "02lz7kvml4m6fx02hy1pgk6ysils9di8n75m166kcpla0b206dmb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) - ("rust-freetype" ,rust-freetype-0.7) - ("rust-glib" ,rust-glib-0.15) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.17) + ("rust-freetype-rs" ,rust-freetype-rs-0.32) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) + (("rust-float-eq" ,rust-float-eq-1) + ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list pkg-config)) (inputs @@ -199,6 +201,29 @@ (description "Rust bindings for the Cairo library") (license license:expat))) +(define-public rust-cairo-rs-0.15 + (package + (inherit rust-cairo-rs-0.17) + (name "rust-cairo-rs") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) + ("rust-freetype" ,rust-freetype-0.7) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-cairo-rs-0.14 (package (inherit rust-cairo-rs-0.15) -- cgit v1.2.3 From 62c961d311a46e810c31a524e09e6dca068e90b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:12:23 +0300 Subject: gnu: Add rust-cairo-sys-rs-0.17. * gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.17): New variable. (rust-cairo-sys-rs-0.15): Inherit from rust-cairo-sys-rs-0.17. --- gnu/packages/crates-gtk.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index e50dbb0cef..9f1732a68e 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -302,21 +302,21 @@ (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-cairo-sys-rs-0.15 +(define-public rust-cairo-sys-rs-0.17 (package (name "rust-cairo-sys-rs") - (version "0.15.1") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "cairo-sys-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w")))) + (base32 "1ccw4z59dx60khngx79g64c75abfwy7wnq57h2z82j7vn5k0q7b9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-glib-sys" ,rust-glib-sys-0.15) + (("rust-glib-sys" ,rust-glib-sys-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6) ("rust-winapi" ,rust-winapi-0.3) @@ -330,6 +330,26 @@ (description "This package provides FFI bindings to libcairo.") (license license:expat))) +(define-public rust-cairo-sys-rs-0.15 + (package + (inherit rust-cairo-sys-rs-0.17) + (name "rust-cairo-sys-rs") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w")))) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2)))))) + (define-public rust-cairo-sys-rs-0.14 (package (inherit rust-cairo-sys-rs-0.15) -- cgit v1.2.3 From 62e9ca27927faa9d630f6f8fbf1c824a71092712 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:13:02 +0300 Subject: gnu: Add rust-gdk-pixbuf-0.17. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.17): New variable. (rust-gdk-pixbuf-0.15): Inherit from rust-gdk-pixbuf-0.17. --- gnu/packages/crates-gtk.scm | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 9f1732a68e..a5dcc62e18 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -508,27 +508,27 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-gdk-pixbuf-0.15 +(define-public rust-gdk-pixbuf-0.17 (package (name "rust-gdk-pixbuf") - (version "0.15.11") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "gdk-pixbuf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d")))) + (base32 "05q7ajsp2z8xi355h26k7lvq7n3lj9xm61vhn045g3238v46npb9")))) (build-system cargo-build-system) (arguments - `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` - #:tests? #f + `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display` #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15) - ("rust-gio" ,rust-gio-0.15) - ("rust-glib" ,rust-glib-0.15) - ("rust-libc" ,rust-libc-0.2)) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.17) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs @@ -537,9 +537,33 @@ (list gdk-pixbuf)) (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GdkPixbuf library") - (description "Rust bindings for the GdkPixbuf library") + (description "Rust bindings for the @code{GdkPixbuf} library") (license license:expat))) +(define-public rust-gdk-pixbuf-0.15 + (package + (inherit rust-gdk-pixbuf-0.17) + (name "rust-gdk-pixbuf") + (version "0.15.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d")))) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15) + ("rust-gio" ,rust-gio-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-gdk-pixbuf-0.14 (package (inherit rust-gdk-pixbuf-0.15) -- cgit v1.2.3 From e622d62f4aad29e390feb9e3053d780ed4a10f61 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:13:30 +0300 Subject: gnu: Add rust-gdk-pixbuf-sys-0.17. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.17): New variable. (rust-gdk-pixbuf-sys-0.15): Inherit from rust-gdk-pixbuf-sys-0.17. --- gnu/packages/crates-gtk.scm | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index a5dcc62e18..ca441e6e0a 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -639,25 +639,23 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-gdk-pixbuf-sys-0.15 +(define-public rust-gdk-pixbuf-sys-0.17 (package (name "rust-gdk-pixbuf-sys") - (version "0.15.10") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "gdk-pixbuf-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql")))) + (base32 "1jvh91lzanr1a8c5h6ya8i4jzx7ifs8mjxjnmg8dfriw24yfr1cj")))) (build-system cargo-build-system) (arguments - `(;#:skip-build? - ;#t - #:cargo-inputs - (("rust-gio-sys" ,rust-gio-sys-0.15) - ("rust-glib-sys" ,rust-glib-sys-0.15) - ("rust-gobject-sys" ,rust-gobject-sys-0.15) + `(#:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.17) + ("rust-glib-sys" ,rust-glib-sys-0.17) + ("rust-gobject-sys" ,rust-gobject-sys-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs @@ -672,6 +670,29 @@ (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") (license license:expat))) +(define-public rust-gdk-pixbuf-sys-0.15 + (package + (inherit rust-gdk-pixbuf-sys-0.17) + (name "rust-gdk-pixbuf-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql")))) + (arguments + `(#:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-gdk-pixbuf-sys-0.14 (package (inherit rust-gdk-pixbuf-sys-0.15) -- cgit v1.2.3 From 55b3817d53174d2ae593ea139f866ee53a5528b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:13:59 +0300 Subject: gnu: Add rust-gio-0.17. * gnu/packages/crates-gtk.scm (rust-gio-0.17): New variable. (rust-gio-0.15): Inherit from rust-gio-0.17. --- gnu/packages/crates-gtk.scm | 51 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index ca441e6e0a..fb46fedfad 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -858,36 +858,38 @@ (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gio-0.15 +(define-public rust-gio-0.17 (package (name "rust-gio") - (version "0.15.12") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "gio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8")))) + (base32 "02nkqpq1a6ikzhv5x4nyfvzx8zk5dkjsjm50ns4qdybwjf93x5x6")))) (build-system cargo-build-system) (arguments - `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` - #:tests? #f + `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display` #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-futures-channel" ,rust-futures-channel-0.3) ("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-io" ,rust-futures-io-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-gio-sys" ,rust-gio-sys-0.15) - ("rust-glib" ,rust-glib-0.15) + ("rust-gio-sys" ,rust-gio-sys-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs - (("rust-futures-util" ,rust-futures-util-0.3) + (("rust-futures" ,rust-futures-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) ("rust-gir-format-check" ,rust-gir-format-check-0.1) - ("rust-serial-test" ,rust-serial-test-0.6)))) + ("rust-serial-test" ,rust-serial-test-1)))) (native-inputs (list pkg-config)) (inputs @@ -897,6 +899,37 @@ (description "Rust bindings for the Gio library") (license license:expat))) +(define-public rust-gio-0.15 + (package + (inherit rust-gio-0.17) + (name "rust-gio") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8")))) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-serial-test" ,rust-serial-test-0.6)))))) + (define-public rust-gio-0.14 (package (inherit rust-gio-0.15) -- cgit v1.2.3 From 3e52fbcf340d767b947c239648383c61c20a0050 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:14:26 +0300 Subject: gnu: Add rust-pango-0.17. * gnu/packages/crates-gtk.scm (rust-pango-0.17): New variable. (rust-pango-0.15): Inherit from rust-pango-0.17. --- gnu/packages/crates-gtk.scm | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index fb46fedfad..947bcc550e 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1936,27 +1936,28 @@ library.") (license license:expat))) -(define-public rust-pango-0.15 +(define-public rust-pango-0.17 (package (name "rust-pango") - (version "0.15.10") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "pango" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12")))) + (base32 "0j0xj9yw81qivqb0y34j9c5azjsdspxp1zzpvxi1zri0qrplbgim")))) (build-system cargo-build-system) (arguments `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` #:tests? #f #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-glib" ,rust-glib-0.15) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango-sys" ,rust-pango-sys-0.15)) + ("rust-pango-sys" ,rust-pango-sys-0.17)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs @@ -1965,9 +1966,33 @@ library.") (list pango)) (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the Pango library") - (description "Rust bindings for the Pango library") + (description "This package provides Rust bindings for the Pango library.") (license license:expat))) +(define-public rust-pango-0.15 + (package + (inherit rust-pango-0.17) + (name "rust-pango") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12")))) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pango-sys" ,rust-pango-sys-0.15)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pango-0.14 (package (inherit rust-pango-0.15) -- cgit v1.2.3 From 063bc94017b3c51836c1fbca601f92b61a08e56b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:14:51 +0300 Subject: gnu: Add rust-pango-sys-0.17. * gnu/packages/crates-gtk.scm (rust-pango-sys-0.17): New variable. (rust-pango-sys-0.15): Inherit from rust-pango-sys-0.17. --- gnu/packages/crates-gtk.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 947bcc550e..695116e5a2 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -2071,22 +2071,22 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-pango-sys-0.15 +(define-public rust-pango-sys-0.17 (package (name "rust-pango-sys") - (version "0.15.10") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "pango-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j")))) + (base32 "15aindwdxsydzvqcvhc9ysamx5v1jmq8qbs61ncxic2h72grz9ix")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-glib-sys" ,rust-glib-sys-0.15) - ("rust-gobject-sys" ,rust-gobject-sys-0.15) + (("rust-glib-sys" ,rust-glib-sys-0.17) + ("rust-gobject-sys" ,rust-gobject-sys-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs @@ -2101,6 +2101,28 @@ library.") (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pango-sys-0.15 + (package + (inherit rust-pango-sys-0.17) + (name "rust-pango-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j")))) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-pango-sys-0.14 (package (inherit rust-pango-sys-0.15) -- cgit v1.2.3 From bd73bec121ab894f8b87856e6883fd8791d47f9f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:16:33 +0300 Subject: gnu: Add rust-pangocairo-sys-0.17. * gnu/packages/crates-gtk.scm (rust-pangocairo-sys-0.17): New variable. (rust-pangocairo-sys-0.15): Inherit from rust-pangocairo-sys-0.17. --- gnu/packages/crates-gtk.scm | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 695116e5a2..0abfddcea4 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -2222,8 +2222,41 @@ library.") "Rust bindings for the PangoCairo library.") (license license:expat))) +(define-public rust-pangocairo-sys-0.17 + (package + (name "rust-pangocairo-sys") + (version "0.17.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ymr4aqrdpysz0rh383s4h6hj8nbkyj7n4723f45zzzqkf6x7pwl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.17) + ("rust-glib-sys" ,rust-glib-sys-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.17) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + ;; XXX: Should these be propagated from their respective crates? + (list cairo glib pango)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to @code{PangoCairo}.") + (license license:expat))) + (define-public rust-pangocairo-sys-0.15 (package + (inherit rust-pangocairo-sys-0.17) (name "rust-pangocairo-sys") (version "0.15.1") (source @@ -2235,7 +2268,6 @@ library.") (sha256 (base32 "154llaawy60zh8fkw2yq0r31ynpmqlsr7brryzaq2v4ijijp9kvq")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) @@ -2245,16 +2277,7 @@ library.") ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) - ("rust-tempfile" ,rust-tempfile-3)))) - (native-inputs - (list pkg-config)) - (inputs - ;; XXX: Should these be propagated from their respective crates? - (list cairo glib pango)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgtk-3") - (description "This package provides FFI bindings to libgtk-3.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-soup-sys-0.10 (package -- cgit v1.2.3 From 278f8a7de8b2a27f5250bb511fef0504ab33b6a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:17:01 +0300 Subject: gnu: Add rust-pangocairo-0.17. * gnu/packages/crates-gtk.scm (rust-pangocairo-0.17): New variable. (rust-pangocairo-0.15): Inherit from rust-pangocairo-0.17. --- gnu/packages/crates-gtk.scm | 47 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 0abfddcea4..e816c5ee41 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -2187,8 +2187,43 @@ library.") (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-pangocairo-0.17 + (package + (name "rust-pangocairo") + (version "0.17.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kr2b31034b8zif4r3lf4rniqphk2bxi2q7n8iwq2wrf3k5jkgw6")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) + ("rust-glib" ,rust-glib-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.17)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "This package provides Rust bindings for the @code{PangoCairo} library.") + (license license:expat))) + (define-public rust-pangocairo-0.15 (package + (inherit rust-pangocairo-0.17) (name "rust-pangocairo") (version "0.15.1") (source @@ -2199,7 +2234,6 @@ library.") (sha256 (base32 "0rjk0clrjxah4kc0kybn7l7bxa5m5kpxkihxc2i7a6hx3xfa8xkq")))) - (build-system cargo-build-system) (arguments `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` #:tests? #f @@ -2211,16 +2245,7 @@ library.") ("rust-pango" ,rust-pango-0.15) ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.15)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (native-inputs - (list pkg-config)) - (inputs - (list pango)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the PangoCairo library") - (description - "Rust bindings for the PangoCairo library.") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-pangocairo-sys-0.17 (package -- cgit v1.2.3 From 724bd3522486f578d836bfff4b96809825eaf951 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:17:40 +0300 Subject: gnu: Add rust-cssparser-0.29. * gnu/packages/crates-io.scm (rust-cssparser-0.29): New variable. (rust-cssparser-0.28): Inherit from rust-cssparser-0.29. --- gnu/packages/crates-io.scm | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a1a162f131..bdcc50ec63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17016,37 +17016,67 @@ algorithms.") hash functions.") (license license:expat))) -(define-public rust-cssparser-0.28 +(define-public rust-cssparser-0.29 (package (name "rust-cssparser") - (version "0.28.1") + (version "0.29.6") (source (origin (method url-fetch) (uri (crate-uri "cssparser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1h924c5g2rwlmgk8hllciyky3ih3z9vf04xz3xsp3cv1jyd5kf0x")))) + (base32 "1yp0zl5cmw9x95np9a51153fdb1ng8fgzwyssg7hr5dmki0h6ggr")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Not all files included in the tarball. #:cargo-inputs (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) ("rust-dtoa-short" ,rust-dtoa-short-0.3) - ("rust-itoa" ,rust-itoa-0.4) + ("rust-itoa" ,rust-itoa-1) ("rust-matches" ,rust-matches-0.1) - ("rust-phf" ,rust-phf-0.8) + ("rust-phf" ,rust-phf-0.10) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/servo/rust-cssparser") (synopsis "Rust implementation of CSS Syntax Level 3") (description "This package contains a Rust implementation of CSS Syntax Level 3.") (license license:mpl2.0))) +(define-public rust-cssparser-0.28 + (package + (inherit rust-cssparser-0.29) + (name "rust-cssparser") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h924c5g2rwlmgk8hllciyky3ih3z9vf04xz3xsp3cv1jyd5kf0x")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-cssparser-0.27 (package (inherit rust-cssparser-0.28) -- cgit v1.2.3 From 4e65f4b1479e67dfe8e4f0f1b2d371524a0348cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:18:19 +0300 Subject: gnu: Add rust-cuda-std-macros-0.2. * gnu/packages/crates-io.scm (rust-cuda-std-macros-0.2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bdcc50ec63..18627b548d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17545,6 +17545,28 @@ re-exported cipher crate.") use with bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-cuda-std-macros-0.2 + (package + (name "rust-cuda-std-macros") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cuda-std-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hlakxn9pz8233pwsh44j8gzqzf078a3lnnq3v2cadmb4c4l1mlz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Macros for cuda_std") + (description "This package provides macros for cuda_std.") + (license (list license:expat license:asl2.0)))) + (define-public rust-curl-0.4 (package (name "rust-curl") -- cgit v1.2.3 From 74130b5e1d8f54cd3d5961788bced25618bf884f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:18:39 +0300 Subject: gnu: Add rust-cuda-std-0.2. * gnu/packages/crates-io.scm (rust-cuda-std-0.2): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 18627b548d..6a90b4b79a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17545,6 +17545,31 @@ re-exported cipher crate.") use with bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-cuda-std-0.2 + (package + (name "rust-cuda-std") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cuda-std" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "174237dj152dvndvykcn17nz2d0kdzsyyxnb6fsdz3i7xa8lfcgn")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Test suite can't find attribute 'kernel'. + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cuda-std-macros" ,rust-cuda-std-macros-0.2) + ("rust-half" ,rust-half-1) + ("rust-paste" ,rust-paste-1) + ("rust-vek" ,rust-vek-0.15)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Standard library for CUDA with rustc_codegen_nvvm") + (description "Standard library for CUDA with rustc_codegen_nvvm.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cuda-std-macros-0.2 (package (name "rust-cuda-std-macros") -- cgit v1.2.3 From 71291463f58a7f49b8b4f2a5e80b8c5b1c629802 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:19:09 +0300 Subject: gnu: Add rust-cust-derive-0.2. * gnu/packages/crates-io.scm (rust-cust-derive-0.2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6a90b4b79a..ee785065c4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17734,6 +17734,28 @@ ristretto255 and Curve25519.") ristretto255 and Curve25519.") (license license:bsd-3))) +(define-public rust-cust-derive-0.2 + (package + (name "rust-cust-derive") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cust-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0rigqx5d1941cbpbd76i455ifh4yzz6fcga2na9fv6k2zsavr8z8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Macros for cust") + (description "This package provices macros for cust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-custom-derive-0.1 (package (name "rust-custom-derive") -- cgit v1.2.3 From 9451486df963af28f747daa681b803e76b820d29 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:19:27 +0300 Subject: gnu: Add rust-cust-core-0.1. * gnu/packages/crates-io.scm (rust-cust-core-0.1): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ee785065c4..80831204c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17734,6 +17734,33 @@ ristretto255 and Curve25519.") ristretto255 and Curve25519.") (license license:bsd-3))) +(define-public rust-cust-core-0.1 + (package + (name "rust-cust-core") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cust-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01jzjwywsngqm8d1vxk3zr9klvidab6iis1myg5r1y5q5ik7k7q3")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `cust` + #:cargo-inputs + (("rust-cust-derive" ,rust-cust-derive-0.2) + ("rust-glam" ,rust-glam-0.20) + ("rust-half" ,rust-half-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-vek" ,rust-vek-0.15)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Core library for cust that can be shared across CPU and GPU") + (description "This package provices the core library for cust that can be +shared across CPU and GPU.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cust-derive-0.2 (package (name "rust-cust-derive") -- cgit v1.2.3 From 846d143870ee2620cf01448afee54464cecd2dc7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:19:48 +0300 Subject: gnu: Add rust-dashmap-5. * gnu/packages/crates-io.scm (rust-dashmap-5): New variable. (rust-dashmap-4): Inherit from rust-dashmap-5. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 80831204c2..201ba83c07 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18468,8 +18468,37 @@ custom derives.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-dashmap-5 + (package + (name "rust-dashmap") + (version "5.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "dashmap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0miqnlxi501vfbv6mw5jbmzgnj0wjrch3p4abvpd59s9v30lg1wp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-lock-api" ,rust-lock-api-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.9) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/xacrimon/dashmap") + (synopsis "Blazing fast concurrent HashMap for Rust") + (description "This package implements a blazing fast concurrent HashMap +for Rust.") + (license license:expat))) + (define-public rust-dashmap-4 (package + (inherit rust-dashmap-5) (name "rust-dashmap") (version "4.0.2") (source @@ -18480,19 +18509,13 @@ custom derives.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "1773x18k5m2zw1iyibs8l3wl1p1aijdbrc0w844xys06inr46yp7")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-rayon" ,rust-rayon-1) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://github.com/xacrimon/dashmap") - (synopsis "Blazing fast concurrent HashMap for Rust") - (description "This package implements a blazing fast concurrent HashMap -for Rust.") - (license license:expat))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-dashmap-3 (package -- cgit v1.2.3 From 271b2e6a7d8eda563859c7368c16447fb84f205c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:20:14 +0300 Subject: gnu: Add rust-data-url-0.2. * gnu/packages/crates-io.scm (rust-data-url-0.2): New variable. (rust-data-url-0.1): Inherit from rust-data-url-0.2. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 201ba83c07..f8725377a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18572,8 +18572,32 @@ for Rust.") hexadecimal, base32, and base64.") (license license:expat))) +(define-public rust-data-url-0.2 + (package + (name "rust-data-url") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-url" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19828d6jby17ghi7vr0zia9sy3hlvvjbngrcsllmfh2zfg1kjx4d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tester" ,rust-tester-0.9)))) + (home-page "https://github.com/servo/rust-url") + (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") + (description + "Processing of data: URL according to WHATWG's Fetch Standard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-data-url-0.1 (package + (inherit rust-data-url-0.2) (name "rust-data-url") (version "0.1.1") (source @@ -18585,19 +18609,13 @@ hexadecimal, base32, and base64.") (sha256 (base32 "14z15yiyklp5dv0k0q6pd83irrn0y8hj9y3fj17akkrbf37byc1s")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-matches" ,rust-matches-0.1)) #:cargo-development-inputs (("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/servo/rust-url") - (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") - (description - "Processing of data: URL according to WHATWG's Fetch Standard.") - (license (list license:expat license:asl2.0)))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-datetime-0.5 (package -- cgit v1.2.3 From d890f1a39443e2fef789bad111e3f87c5a24a94b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:21:15 +0300 Subject: gnu: rust-encoding-rs-0.8: Update to 0.8.33. * gnu/packages/crates-io.scm (rust-encoding-rs-0.8): Update to 0.8.33. [cargo-inputs]: Replace rust-packed-simd-2-0.3 with rust-packed-simd-0.3. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f8725377a1..cd3f397f95 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22436,7 +22436,7 @@ encodings.") (define-public rust-encoding-rs-0.8 (package (name "rust-encoding-rs") - (version "0.8.31") + (version "0.8.33") (source (origin (method url-fetch) @@ -22445,12 +22445,12 @@ encodings.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0azc6rblf75vd862ymjahdfch27j1sshb7zynshrx7ywi5an6llq")))) + "1qa5k4a0ipdrxq4xg9amms9r9pnnfn7nfh2i9m3mw0ka563b6s3j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-packed-simd" ,rust-packed-simd-2-0.3) + ("rust-packed-simd" ,rust-packed-simd-0.3) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) -- cgit v1.2.3 From 01530df91bc46ac4dfb226730ae29967319e8a96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:22:04 +0300 Subject: gnu: Add rust-float-eq-derive-1. * gnu/packages/crates-io.scm (rust-float-eq-derive-1): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cd3f397f95..c16112b519 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25057,6 +25057,28 @@ traits.") (base32 "0036jb8ry4h83n319jb20b5yvyfyq8mx8dkxnyjm22nq8fl8yjhk")))))) +(define-public rust-float-eq-derive-1 + (package + (name "rust-float-eq-derive") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-eq-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mkg635lmr0nwjlxz6f5k8g60hrd800i061hrlmpvhdkl96d74j2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://jtempest.github.io/float_eq-rs/") + (synopsis "Derive macro support for float_eq") + (description "This package provides the derive macro support for float_eq.") + (license (list license:expat license:asl2.0)))) + (define-public rust-float-ord-0.3 (package (name "rust-float-ord") -- cgit v1.2.3 From a68565f4da39e7ab129930ddac90630b31813a00 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:22:24 +0300 Subject: gnu: Add rust-float-eq-1. * gnu/packages/crates-io.scm (rust-float-eq-1): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c16112b519..1ee2e277e9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25057,6 +25057,30 @@ traits.") (base32 "0036jb8ry4h83n319jb20b5yvyfyq8mx8dkxnyjm22nq8fl8yjhk")))))) +(define-public rust-float-eq-1 + (package + (name "rust-float-eq") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-eq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lxqxkvdy5zh3qsksavpcazg57cbyjy9p54m16x13bfq8lqhxa18")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-float-eq-derive" ,rust-float-eq-derive-1) + ("rust-num-complex" ,rust-num-complex-0.4)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://jtempest.github.io/float_eq-rs/") + (synopsis "Compare IEEE floating point primitives, structs and collections") + (description "Compare IEEE floating point primitives, structs and +collections for equality.") + (license (list license:expat license:asl2.0)))) + (define-public rust-float-eq-derive-1 (package (name "rust-float-eq-derive") -- cgit v1.2.3 From 46a2cdd6e9a3e6bcd761dfd75f69a520a80c297d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:23:36 +0300 Subject: gnu: Add rust-freetype-sys-0.17. * gnu/packages/crates-io.scm (rust-freetype-sys-0.17): New variable. (rust-freetype-sys-0.13): Inherit from rust-freetype-sys-0.17. --- gnu/packages/crates-io.scm | 47 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1ee2e277e9..c98b6ff572 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25524,37 +25524,68 @@ values to other threads.") (description "This package provides bindings for FreeType font library.") (license license:expat))) -(define-public rust-freetype-sys-0.13 +(define-public rust-freetype-sys-0.17 (package (name "rust-freetype-sys") - (version "0.13.1") + (version "0.17.0") (source (origin (method url-fetch) (uri (crate-uri "freetype-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06kkds31s6b1i39dyanwmzbnic7laia1kk3gfvx8sqncq08l0zd3")) + (base32 "127z6hbsfhsw0fg110zy9s65fzald0cvwbxmhk1vxmmsdk54hcb4")) (snippet #~(begin (use-modules (guix build utils)) - (delete-file-recursively "freetype2"))))) + (delete-file-recursively "freetype2") + ;; Inspired by Debian's patch for bzip2-sys. + (substitute* "Cargo.toml.orig" + (("cc = .*") "pkg-config = \"0.3\"\n")) + (copy-file "Cargo.toml.orig" "Cargo.toml") + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=freetype\");~@ + }~%"))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cmake" ,rust-cmake-0.1) - ("rust-libc" ,rust-libc-0.2) + (("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3)))) (inputs (list freetype)) - (native-inputs - (list pkg-config)) (home-page "https://github.com/PistonDevelopers/freetype-sys") (synopsis "Low level binding for FreeType font library") (description "This package provides low level binding for FreeType font library.") (license license:expat))) +(define-public rust-freetype-sys-0.13 + (package + (inherit rust-freetype-sys-0.17) + (name "rust-freetype-sys") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06kkds31s6b1i39dyanwmzbnic7laia1kk3gfvx8sqncq08l0zd3")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "freetype2"))))) + (arguments + `(#:cargo-inputs + (("rust-cmake" ,rust-cmake-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + (list pkg-config)))) + (define-public rust-fs2-0.4 (package (name "rust-fs2") -- cgit v1.2.3 From b83c6943feeb7bdfda872b16e6632f3008c74c0b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:24:17 +0300 Subject: gnu: Add rust-freetype-rs-0.32. * gnu/packages/crates-io.scm (rust-freetype-rs-0.32): New variable. (rust-freetype-rs-0.26): Inherit from rust-freetype-rs-0.32. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c98b6ff572..305eb12f90 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25501,8 +25501,35 @@ values to other threads.") (description "This package provides bindings for Freetype used by Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-freetype-rs-0.32 + (package + (name "rust-freetype-rs") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q54jimjgzwdb3xsp7rsvdmp6w54cak7bvc379mdabc2ciz3776m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-freetype-sys" ,rust-freetype-sys-0.17) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) + (inputs + (list freetype)) + (home-page "https://github.com/PistonDevelopers/freetype-rs") + (synopsis "Bindings for FreeType font library") + (description "This package provides bindings for FreeType font library.") + (license license:expat))) + (define-public rust-freetype-rs-0.26 (package + (inherit rust-freetype-rs-0.32) (name "rust-freetype-rs") (version "0.26.0") (source @@ -25512,17 +25539,12 @@ values to other threads.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1yzmbd73hlblbns0dqkcwfj54l97hx3yb0lqpda8rhm5s34xxskl")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-freetype-sys" ,rust-freetype-sys-0.13) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/PistonDevelopers/freetype-rs") - (synopsis "Bindings for FreeType font library") - (description "This package provides bindings for FreeType font library.") - (license license:expat))) + ("rust-libc" ,rust-libc-0.2)))))) (define-public rust-freetype-sys-0.17 (package -- cgit v1.2.3 From eb6705d4410edbb465a6d1512a88a4c8e42c83a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:24:41 +0300 Subject: gnu: Add rust-gg-alloc-1. * gnu/packages/crates-io.scm (rust-gg-alloc-1): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 305eb12f90..fed4ac55d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27578,6 +27578,24 @@ getters and setters on fields.") @acronym{GFA, Graphical Fragment Assembly} format.") (license license:expat))) +(define-public rust-gg-alloc-1 + (package + (name "rust-gg-alloc") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gg-alloc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fi2z9p5klgqbhgqxqxwz03j4axz4vf0s58mlndrxddy397i7r8y")))) + (build-system cargo-build-system) + (home-page "https://github.com/Badel2/gg-alloc") + (synopsis "Custom allocator that only returns pointers above 2G") + (description "This package provides a custom allocator that only returns +pointers above 2G.") + (license license:gpl3))) + (define-public rust-ghash-0.5 (package (name "rust-ghash") -- cgit v1.2.3 From 0cd7a505622a1e5518600b2cc3027b923247c296 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:25:26 +0300 Subject: gnu: Add rust-glam-0.24. * gnu/packages/crates-io.scm (rust-glam-0.24): New variable. (rust-glam-0.17): Inherit from rust-glam-0.24. --- gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fed4ac55d4..62840f857b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28128,27 +28128,34 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) -(define-public rust-glam-0.17 +(define-public rust-glam-0.24 (package (name "rust-glam") - (version "0.17.3") + (version "0.24.2") (source (origin (method url-fetch) (uri (crate-uri "glam" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xm7jdygbxchdvk6k1l1pdag843nkwdm8fikwgp0i1gxgawk45z0")))) + (base32 "0ibrq68ldg1gyynb5ss5hx0gr6p3397cfclh1xrl5prba4bqqhdm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-approx" ,rust-approx-0.5) + ("rust-bytecheck" ,rust-bytecheck-0.6) ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-libm" ,rust-libm-0.2) ("rust-mint" ,rust-mint-0.5) - ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) - ("rust-serde" ,rust-serde-1)))) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/bitshifter/glam-rs") (synopsis "3D math library for games and graphics") (description @@ -28156,6 +28163,28 @@ libcurl, which is intended to be used with the @code{git2} crate.") graphics.") (license (list license:expat license:asl2.0)))) +(define-public rust-glam-0.17 + (package + (inherit rust-glam-0.24) + (name "rust-glam") + (version "0.17.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xm7jdygbxchdvk6k1l1pdag843nkwdm8fikwgp0i1gxgawk45z0")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1)))))) + (define-public rust-glam-0.16 (package (name "rust-glam") -- cgit v1.2.3 From d9bc1919667c97e781458857b4c1306d57d24f72 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:26:24 +0300 Subject: gnu: Add rust-glam-0.23. * gnu/packages/crates-io.scm (rust-glam-0.23): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 62840f857b..6e2d5245dc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28163,6 +28163,34 @@ libcurl, which is intended to be used with the @code{git2} crate.") graphics.") (license (list license:expat license:asl2.0)))) +(define-public rust-glam-0.23 + (package + (inherit rust-glam-0.24) + (name "rust-glam") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "076mdgmy38lhlvgng74iy2sr3iih58gx5qcz20g0hmamv6dgsjlf")))) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytecheck" ,rust-bytecheck-0.6) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) + (define-public rust-glam-0.17 (package (inherit rust-glam-0.24) -- cgit v1.2.3 From 17ff7f7b6ff7fea3ec010a6fe111ed5108e9b623 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:26:51 +0300 Subject: gnu: Add rust-glam-0.22. * gnu/packages/crates-io.scm (rust-glam-0.22): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e2d5245dc..02cc32270a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28191,6 +28191,34 @@ graphics.") ("rust-serde-json" ,rust-serde-json-1) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) +(define-public rust-glam-0.22 + (package + (inherit rust-glam-0.24) + (name "rust-glam") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x57gyrxyfs409b3f5i64yy2pbcgkr2qkq8v3a0mmm8vdkargx8j")))) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytecheck" ,rust-bytecheck-0.6) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) + (define-public rust-glam-0.17 (package (inherit rust-glam-0.24) -- cgit v1.2.3 From 613e42cfed0ff33dbd9f9af69642f4cfefbf45bb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:27:11 +0300 Subject: gnu: Add rust-glam-0.21. * gnu/packages/crates-io.scm (rust-glam-0.21): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 02cc32270a..764226809a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28219,6 +28219,19 @@ graphics.") ("rust-serde-json" ,rust-serde-json-1) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) +(define-public rust-glam-0.21 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.21.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05c8r639hz3ydlhbhv6d9z6193iivi8276zz2fq3hqw6ci8am3si")))))) + (define-public rust-glam-0.17 (package (inherit rust-glam-0.24) -- cgit v1.2.3 From df459876cce765c716f400d19d3ae679ea6757e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:27:31 +0300 Subject: gnu: Add rust-glam-0.20. * gnu/packages/crates-io.scm (rust-glam-0.20): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 764226809a..5dc90db9b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28232,6 +28232,19 @@ graphics.") (sha256 (base32 "05c8r639hz3ydlhbhv6d9z6193iivi8276zz2fq3hqw6ci8am3si")))))) +(define-public rust-glam-0.20 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.20.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pv7n634vw2hn9fmi915pzgangyljgsp4m5505c3zq2bfiz9agpl")))))) + (define-public rust-glam-0.17 (package (inherit rust-glam-0.24) -- cgit v1.2.3 From 31dc5e4bd0d3d41fb5e291b14789e4f2372d9fa1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:27:52 +0300 Subject: gnu: Add rust-glam-0.19. * gnu/packages/crates-io.scm (rust-glam-0.19): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5dc90db9b2..383747c6d0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28245,6 +28245,19 @@ graphics.") (sha256 (base32 "0pv7n634vw2hn9fmi915pzgangyljgsp4m5505c3zq2bfiz9agpl")))))) +(define-public rust-glam-0.19 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jjia0nva5p7ca3dma8jhzxd4dmczgbhn3b338ffh5hmg7k0k19b")))))) + (define-public rust-glam-0.17 (package (inherit rust-glam-0.24) -- cgit v1.2.3 From 20e51472febea66069271e838089ead6e6585503 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:28:11 +0300 Subject: gnu: Add rust-glam-0.18. * gnu/packages/crates-io.scm (rust-glam-0.18): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 383747c6d0..0a73f1dfe7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28258,6 +28258,19 @@ graphics.") (sha256 (base32 "1jjia0nva5p7ca3dma8jhzxd4dmczgbhn3b338ffh5hmg7k0k19b")))))) +(define-public rust-glam-0.18 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0d7f7f7cdbahxk677k6l8h7r4bxxni24nzdndwr8wyx71d4kwnjj")))))) + (define-public rust-glam-0.17 (package (inherit rust-glam-0.24) -- cgit v1.2.3 From 9769954e72a42faaba75d8871d92383b255fde9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:28:34 +0300 Subject: gnu: rust-half-1: Update to 1.8.2. * gnu/packages/crates-io.scm (rust-half-1): Update to 1.8.2. [cargo-inputs]: Add rust-bytemuck-1, rust-num-traits-0.2, rust-zerocopy-0.6. [cargo-development-inputs]: Replace rust-quickcheck-0.9 with 1, rust-quickcheck-macros-0.9 with 1, rust-rand-0.7 with 0.8. Remove rust-version-sync-0.8. --- gnu/packages/crates-io.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0a73f1dfe7..c281abdd60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29226,23 +29226,25 @@ IEEE 754-2008 binary16 type.") (package (inherit rust-half-2) (name "rust-half") - (version "1.7.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (crate-uri "half" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wzavaaaa2jwkm4i1dbglmwjfsdhn4n73wrkbdzllaynlams5b32")))) + (base32 "1mqbmx2m9qd4lslkb42fzgldsklhv9c4bxsc8j82r80d8m24mfza")))) (arguments `(#:cargo-inputs - (("rust-serde" ,rust-serde-1)) + (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-zerocopy" ,rust-zerocopy-0.6)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.9) - ("rust-rand" ,rust-rand-0.7) - ("rust-version-sync" ,rust-version-sync-0.8)))))) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-rand" ,rust-rand-0.8)))))) (define-public rust-home-0.5 (package -- cgit v1.2.3 From 92f768434ea1dcac83277c04ebef5f054de7fbfb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:30:07 +0300 Subject: gnu: rust-js-sys-0.3: Update to 0.3.64. * gnu/packages/crates-io.scm (rust-js-sys-0.3): Update to 0.3.64. [source]: Adjust snippet to be future-proof. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c281abdd60..298c463858 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34205,7 +34205,7 @@ JSON-RPC 2.0 specification.") (define-public rust-js-sys-0.3 (package (name "rust-js-sys") - (version "0.3.61") + (version "0.3.64") (source (origin (method url-fetch) @@ -34213,12 +34213,12 @@ JSON-RPC 2.0 specification.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0c075apyc5fxp2sbgr87qcvq53pcjxmp05l47lzlhpn5a0hxwpa4")) + (base32 "0nlkiwpm8dyqcf1xyc6qmrankcgdd3fpzc0qyfq2sw3z97z9bwf5")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Cargo.toml" - (("=0\\.3\\.34") "^0.3.34")))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 12e6179e2fb5c87e86e76bf87a2080c2fba026c9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:30:42 +0300 Subject: gnu: rust-lock-api-0.4: Update to 0.4.10. * gnu/packages/crates-io.scm (rust-lock-api-0.4): Update to 0.4.10. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 298c463858..5b99d45c74 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36741,7 +36741,7 @@ by inspecting the system for user preference.") (define-public rust-lock-api-0.4 (package (name "rust-lock-api") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) @@ -36749,7 +36749,7 @@ by inspecting the system for user preference.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1py41vk243hwk345nhkn5nw0bd4m03gzjmprdjqq6rg5dwv12l23")))) + "05nd9nzxqidg24d1k8y5vlc8lz9gscpskrikycib46qbl8brgk61")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From e103ecdcf53b10e21b9ee07064854308dd43e614 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:31:11 +0300 Subject: gnu: Add rust-lopdf-0.29. * gnu/packages/crates-io.scm (rust-lopdf-0.29): New variable. (rust-lopdf-0.26): Inherit from rust-lopdf-0.29. --- gnu/packages/crates-io.scm | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b99d45c74..77908fd847 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -37015,8 +37015,44 @@ explosion.") image together with its neighboring pixels.") (license license:expat))) +(define-public rust-lopdf-0.29 + (package + (name "rust-lopdf") + (version "0.29.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lopdf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p59fkn9rkas0jywm7z24970k3lpv71sxxabmkmnig3d1p26j3yy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-encoding" ,rust-encoding-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-image" ,rust-image-0.24) + ("rust-itoa" ,rust-itoa-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-nom" ,rust-nom-6) + ("rust-pom" ,rust-pom-3) + ("rust-rayon" ,rust-rayon-1) + ("rust-time" ,rust-time-0.2) + ("rust-weezl" ,rust-weezl-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/J-F-Liu/lopdf") + (synopsis "Rust library for PDF document manipulation") + (description + "This package provides a Rust library for PDF document manipulation.") + (license license:expat))) + (define-public rust-lopdf-0.26 (package + (inherit rust-lopdf-0.29) (name "rust-lopdf") (version "0.26.0") (source @@ -37027,7 +37063,6 @@ image together with its neighboring pixels.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "1wqnmibs8qzi6pr3ig4h3sg6bfkkgyv4ngdng81x069725r056ml")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -37042,12 +37077,7 @@ image together with its neighboring pixels.") ("rust-nom" ,rust-nom-6) ("rust-pom" ,rust-pom-3) ("rust-rayon" ,rust-rayon-1) - ("rust-time" ,rust-time-0.2)))) - (home-page "https://github.com/J-F-Liu/lopdf") - (synopsis "Rust library for PDF document manipulation") - (description - "This package provides a Rust library for PDF document manipulation.") - (license license:expat))) + ("rust-time" ,rust-time-0.2)))))) (define-public rust-lru-0.7 (package -- cgit v1.2.3 From 1347a92dcf75ce653e1d8e10badac4a265a3978e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:31:38 +0300 Subject: gnu: Add rust-nalgebra-0.32. * gnu/packages/crates-io.scm (rust-nalgebra-0.32): New variable. (rust-nalgebra-0.29): Inherit from rust-nalgebra-0.32. --- gnu/packages/crates-io.scm | 75 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 77908fd847..8a76250f07 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40159,8 +40159,74 @@ quick compile time, and minimal dependencies.") (description "Run NASM during your Cargo build.") (license (list license:expat license:asl2.0)))) +(define-public rust-nalgebra-0.32 + (package + (name "rust-nalgebra") + (version "0.32.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ahwmg15v2qschc1y64hg5r2hdp7m0izv11zx0lkyhn2ijqxjzih")))) + (build-system cargo-build-system) + (arguments + `(;#:features '("debug" "compare" "rand" "macros") + #:cargo-test-flags + ;; Feature list as requested by the test suite. + '("--release" "--features" "debug,compare,rand,macros") + #:cargo-inputs + (("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.5) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-cust-core" ,rust-cust-core-0.1) + ("rust-glam" ,rust-glam-0.24) + ("rust-glam" ,rust-glam-0.23) + ("rust-glam" ,rust-glam-0.22) + ("rust-glam" ,rust-glam-0.21) + ("rust-glam" ,rust-glam-0.20) + ("rust-glam" ,rust-glam-0.19) + ("rust-glam" ,rust-glam-0.18) + ("rust-glam" ,rust-glam-0.17) + ("rust-glam" ,rust-glam-0.16) + ("rust-glam" ,rust-glam-0.15) + ("rust-glam" ,rust-glam-0.14) + ("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.3) + ("rust-mint" ,rust-mint-0.5) + ("rust-nalgebra-macros" ,rust-nalgebra-macros-0.2) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-rational" ,rust-num-rational-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-proptest" ,rust-proptest-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-simba" ,rust-simba-0.8) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-matrixcompare" ,rust-matrixcompare-0.3) + ("rust-rand-isaac" ,rust-rand-isaac-0.3) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://nalgebra.org") + (synopsis "Linear algebra library") + (description + "This package provides a general-purpose linear algebra library with +transformations and statically-sized or dynamically-sized matrices.") + (license license:bsd-3))) + (define-public rust-nalgebra-0.29 (package + (inherit rust-nalgebra-0.32) (name "rust-nalgebra") (version "0.29.0") (source @@ -40171,7 +40237,6 @@ quick compile time, and minimal dependencies.") (sha256 (base32 "1zri11vkrbk3ayvy8xqcdvvyjvfcbl5a18x8z82racnn11zfn1nm")) (modules '((guix build utils))))) - (build-system cargo-build-system) (arguments `(#:tests? #f ;TODO: how to enable required features? #:cargo-inputs @@ -40207,13 +40272,7 @@ quick compile time, and minimal dependencies.") ("rust-matrixcompare" ,rust-matrixcompare-0.3) ("rust-rand-isaac" ,rust-rand-isaac-0.3) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://nalgebra.org") - (synopsis "Linear algebra library") - (description - "This package provides a general-purpose linear algebra library with -transformations and statically-sized or dynamically-sized matrices.") - (license license:bsd-3))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-nalgebra-0.27 (package -- cgit v1.2.3 From 6402168f6d8af3382811a79fea26a92df7203a92 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:32:09 +0300 Subject: gnu: Add rust-nalgebra-macros-0.2. * gnu/packages/crates-io.scm (rust-nalgebra-macros-0.2): New variable. (rust-nalgebra-macros-0.1): Inherit from rust-nalgebra-macros-0.2. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8a76250f07..f38dca405e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40456,8 +40456,35 @@ statically-sized or dynamically-sized matrices.") (("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-nalgebra-macros-0.2 + (package + (name "rust-nalgebra-macros") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "166rzbzi1hcyjfvwxmrdimrcmflvxxifjfkqxxkdjfnhcznilxli")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-nalgebra" ,rust-nalgebra-0.32) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://nalgebra.org") + (synopsis "Procedural macros for nalgebra") + (description "This package provides procedural macros for the nalgebra +linear algebra library.") + (license license:asl2.0))) + (define-public rust-nalgebra-macros-0.1 (package + (inherit rust-nalgebra-macros-0.2) (name "rust-nalgebra-macros") (version "0.1.0") (source @@ -40473,7 +40500,6 @@ statically-sized or dynamically-sized matrices.") (substitute* "Cargo.toml" ;; The resolver feature is not supported by our versions of Cargo. (("resolver = \"2\".*") "")))))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -40481,12 +40507,7 @@ statically-sized or dynamically-sized matrices.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-nalgebra" ,rust-nalgebra-0.26)))) - (home-page "https://nalgebra.org") - (synopsis "Procedural macros for nalgebra") - (description "This package provides procedural macros for the nalgebra -linear algebra library.") - (license license:asl2.0))) + (("rust-nalgebra" ,rust-nalgebra-0.26)))))) (define-public rust-napi-0.5 (package -- cgit v1.2.3 From c090c7f17da94b136ddb34d4a55606ea5eefb450 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:32:55 +0300 Subject: gnu: rust-packed-simd-0.3: Update to 0.3.9. * gnu/packages/crates-io.scm (rust-packed-simd-0.3): Update to 0.3.9. [cargo-inputs]: Remove rust-libm-0.1. Add rust-num-traits-0.2. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f38dca405e..448070f86f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45407,7 +45407,7 @@ signing/verification, and general purpose curve arithmetic support.") (define-public rust-packed-simd-0.3 (package (name "rust-packed-simd") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) @@ -45416,7 +45416,7 @@ signing/verification, and general purpose curve arithmetic support.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17xih19yr6izg1d065d2ax29axs7bmywnxa3qps0l6d3bd4nbybc")) + "0bck71ngyhx9icy7q3xzgmjxkylysxm6hgif5rqp2xc71jphi7qz")) (modules '((guix build utils))) (snippet '(begin (substitute* "Cargo.toml" @@ -45424,11 +45424,12 @@ signing/verification, and general purpose curve arithmetic support.") (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments + ;; `#![feature]` may not be used on the stable release channel `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-core-arch" ,rust-core-arch-0.1) - ("rust-libm" ,rust-libm-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) ("rust-sleef-sys" ,rust-sleef-sys-0.1)) #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) -- cgit v1.2.3 From ccb941ffdbec2a47f271aa5b4c21c5abc93fedd6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:33:33 +0300 Subject: gnu: rust-parking-lot-core-0.9: Update to 0.9.8. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.9): Update to 0.9.8. [cargo-inputs]: Replace rust-redox-syscall-0.2 with 0.3, rust-windows-sys-0.45 with 0.48. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 448070f86f..bdbf32afdf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45993,14 +45993,14 @@ synchronization primitives.") (define-public rust-parking-lot-core-0.9 (package (name "rust-parking-lot-core") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (crate-uri "parking_lot_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08cm5gg3a4jmr683x9dgih8vj66yn772kjvc8y1m0flyz6wwnsch")))) + "0ixlak319bpzldq20yvyfqk0y1vi736zxbw101jvzjp7by30rw4k")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -46008,10 +46008,10 @@ synchronization primitives.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) ("rust-petgraph" ,rust-petgraph-0.6) - ("rust-redox-syscall" ,rust-redox-syscall-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.3) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-4) - ("rust-windows-sys" ,rust-windows-sys-0.45)))) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") (description "This package provides an advanced API for creating custom -- cgit v1.2.3 From 751c4249d11aaa676c189fab7733a7993ee66b54 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:34:22 +0300 Subject: gnu: rust-paste-1: Update to 1.0.14. * gnu/packages/crates-io.scm (rust-paste-1): Update to 1.0.14. [arguments]: Don't skip build. Skip test suite. [cargo-development-inputs]: Add rust-paste-test-suite-0.0.0, rust-rustversion-1, rust-trybuild-1. --- gnu/packages/crates-io.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bdbf32afdf..afcc4bfc2c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46511,16 +46511,21 @@ Format (MCF).") (define-public rust-paste-1 (package (name "rust-paste") - (version "1.0.4") + (version "1.0.14") (source (origin (method url-fetch) (uri (crate-uri "paste" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hfikh0bds8hqn371l2wf039mp6b5wrmwrwg96jcs6lkjm6mrmn5")))) + (base32 "0k7d54zz8zrz0623l3xhvws61z5q2wd3hkwim6gylk8212placfy")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:tests? #f ; Can't compile rust-paste-test-suite + #:cargo-development-inputs + (("rust-paste-test-suite" ,rust-paste-test-suite-0.0.0) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/paste") (synopsis "Macros for all your token pasting needs") (description -- cgit v1.2.3 From 238d398451577837dcfe8a5f73dee937ac28a1d5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:35:22 +0300 Subject: gnu: Add rust-paste-test-suite-0.0.0. * gnu/packages/crates-io.scm (rust-paste-test-suite-0.0.0): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index afcc4bfc2c..fe82ac5c4f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46580,6 +46580,24 @@ Format (MCF).") "Implementation detail of the paste crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-paste-test-suite-0.0.0 + (package + (name "rust-paste-test-suite") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "paste-test-suite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mllghv41sz978ymxym8nm6yh1qljshsbjk6iaycbk6zlw7gqagh")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) ; Not meant to be used individually. + (home-page "https://github.com/dtolnay/paste") + (synopsis "Test suite of the paste crate") + (description "Test suite of the paste crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-path-abs-0.5 (package (name "rust-path-abs") -- cgit v1.2.3 From f9514b275529ccf8e44cfb4950a54d63a258801f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:35:45 +0300 Subject: gnu: rust-proc-macro2-1: Update to 1.0.67. * gnu/packages/crates-io.scm (rust-proc-macro2-1): Update to 1.0.67. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fe82ac5c4f..e4c86bdb95 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50224,7 +50224,7 @@ in your code.") (define-public rust-proc-macro2-1 (package (name "rust-proc-macro2") - (version "1.0.64") + (version "1.0.67") (source (origin (method url-fetch) @@ -50232,7 +50232,7 @@ in your code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1nm7qw54jn9n0g1ygkw4f63vj90m241yih6ph3g6zx7irdi3p03q")))) + "0a0k7adv0yswsgzsqkd7r6ng8rpcdyqrhra5v5ii531y3agkshrx")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--lib") -- cgit v1.2.3 From 86edf73f28d512e1a85f7c5647fdee903da1e6b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:36:09 +0300 Subject: gnu: rust-quote-1: Update to 1.0.33. * gnu/packages/crates-io.scm (rust-quote-1): Update to 1.0.33. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e4c86bdb95..4158465b40 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52451,14 +52451,14 @@ transport protocol in Rust.") (define-public rust-quote-1 (package (name "rust-quote") - (version "1.0.29") + (version "1.0.33") (source (origin (method url-fetch) (uri (crate-uri "quote" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "019ij5fwp56ydww6zr46dhmzsf078qkdq9vz6mw1cri7mgl1ac2p")))) + "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 482872a547f1b0347923c6f9809779041ced8d75 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:36:36 +0300 Subject: gnu: rust-rayon-1: Update to 1.8.0. * gnu/packages/crates-io.scm (rust-rayon-1): Update to 1.8.0. [cargo-development-inputs]: Remove rust-lazy-static-1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4158465b40..664948701e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53721,22 +53721,21 @@ accessors.") (define-public rust-rayon-1 (package (name "rust-rayon") - (version "1.6.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (crate-uri "rayon" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1dsr0yyfgdsg8ggh37kq678mfa5j3js6p16ksb7knazhml9s5cvd")))) + (base32 "1cfdnvchf7j4cpha5jkcrrsr61li9i9lp5ak7xdq6d3pvc1xn9ww")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-either" ,rust-either-1) ("rust-rayon-core" ,rust-rayon-core-1)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-rand" ,rust-rand-0.8) + (("rust-rand" ,rust-rand-0.8) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)))) (home-page "https://github.com/rayon-rs/rayon") (synopsis "Simple work-stealing parallelism for Rust") -- cgit v1.2.3 From 047e84ae9569795310854176627e9cd389a1f69e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:37:16 +0300 Subject: gnu: rust-rayon-core-1: Update to 1.12.0. * gnu/packages/crates-io.scm (rust-rayon-core-1): Update to 1.12.0. [cargo-inputs]: Remove rust-crossbeam-channel-0.5, rust-num-cpus-1. --- gnu/packages/crates-io.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 664948701e..c599eda1d8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53795,24 +53795,20 @@ Rust.") (define-public rust-rayon-core-1 (package (name "rust-rayon-core") - (version "1.10.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (crate-uri "rayon-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lvavqk42lmll47q008j8y6nw54f3sfvcjlbaa26iaq0bnpi1i6a")))) + (base32 "1vaq0q71yfvcwlmia0iqf6ixj2fibjcf2xjy92n1m1izv1mgpqsw")))) (build-system cargo-build-system) (arguments - ;; One of the tests attempts to overflow the stack, but the compiler has - ;; since gotten smarter and the test became defective. - `(#:tests? #f + `(#:tests? #f ; `Sender` cannot be shared between threads safely #:cargo-inputs - (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) - ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-num-cpus" ,rust-num-cpus-1)) + (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.8) -- cgit v1.2.3 From 610803c04ee9c7f71820d9b4f4feaabdf609cc30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:38:09 +0300 Subject: gnu: Add rust-rctree-0.5. * gnu/packages/crates-io.scm (rust-rctree-0.5): New variable. (rust-rctree-0.4): Inherit from rust-rctree-0.5. --- gnu/packages/crates-io.scm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c599eda1d8..eaf5b72891 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53894,8 +53894,27 @@ Rust.") ("rust-webpki" ,rust-webpki-0.22) ("rust-x509-parser" ,rust-x509-parser-0.12)))))) +(define-public rust-rctree-0.5 + (package + (name "rust-rctree") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rctree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kvzahkwriawhjjb08ai7rfi77px7rpx5h83hjcx6dccyxzf4hiv")))) + (build-system cargo-build-system) + (home-page "https://github.com/RazrFalcon/rctree") + (synopsis "DOM-like tree implemented using reference counting") + (description "This package provides a @code{DOM-like} tree implemented using +reference counting.") + (license license:expat))) + (define-public rust-rctree-0.4 (package + (inherit rust-rctree-0.5) (name "rust-rctree") (version "0.4.0") (source @@ -53905,13 +53924,7 @@ Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s92472lniqn2c0b5ln8ssl014x0raiyzkk0hagrvsd6far2iq4s")))) - (build-system cargo-build-system) - (home-page "https://github.com/RazrFalcon/rctree") - (synopsis "DOM-like tree implemented using reference counting") - (description "This package provides a @code{DOM-like} tree implemented using -reference counting.") - (license license:expat))) + "1s92472lniqn2c0b5ln8ssl014x0raiyzkk0hagrvsd6far2iq4s")))))) (define-public rust-rdrand-0.4 (package -- cgit v1.2.3 From e98817b2a924f36932747ac41826d92038f21cf4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:38:38 +0300 Subject: gnu: Add rust-selectors-0.24. * gnu/packages/crates-io.scm (rust-selectors-0.24): New variable. (rust-selectors-0.23): Inherit from rust-selectors-0.24. --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eaf5b72891..40d7b2a109 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59976,8 +59976,40 @@ macOS and iOS.") (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-selectors-0.24 + (package + (name "rust-selectors") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "selectors" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05il06smqbhf7p18fawm5fd0pmdkysvmyih455lh17cnh20mfdqc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cssparser" ,rust-cssparser-0.29) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-phf" ,rust-phf-0.8) + ("rust-phf-codegen" ,rust-phf-codegen-0.8) + ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) + ("rust-servo-arc" ,rust-servo-arc-0.2) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-to-shmem" ,rust-to-shmem-0.0.0) + ("rust-to-shmem-derive" ,rust-to-shmem-derive-0.0.0)))) + (home-page "https://github.com/servo/servo") + (synopsis "CSS Selectors matching for Rust") + (description "This package provides CSS Selectors matching for Rust.") + (license license:mpl2.0))) + (define-public rust-selectors-0.23 (package + (inherit rust-selectors-0.24) (name "rust-selectors") (version "0.23.0") (source @@ -59988,7 +60020,6 @@ macOS and iOS.") (sha256 (base32 "17w7slv2bkksvbq6pggx3db23vh1g022hxv06smilwmyhv38gspx")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -60000,11 +60031,7 @@ macOS and iOS.") ("rust-phf-codegen" ,rust-phf-codegen-0.8) ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) ("rust-servo-arc" ,rust-servo-arc-0.1) - ("rust-smallvec" ,rust-smallvec-1)))) - (home-page "https://github.com/servo/servo") - (synopsis "CSS Selectors matching for Rust") - (description "This package provides CSS Selectors matching for Rust.") - (license license:mpl2.0))) + ("rust-smallvec" ,rust-smallvec-1)))))) (define-public rust-selectors-0.22 (package -- cgit v1.2.3 From d95b62d9019e70d59ebf436aa78b5fd0f4a76a9a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:39:21 +0300 Subject: gnu: rust-serde-1: Update to 1.0.188. * gnu/packages/crates-io.scm (rust-serde-1): Update to 1.0.188. [arguments]: Don't skip tests. [cargo-development-inputs]: Add rust-serde-derive-1. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 40d7b2a109..f248a30630 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60402,7 +60402,7 @@ fragment of code.") (define-public rust-serde-1 (package (name "rust-serde") - (version "1.0.171") + (version "1.0.188") (source (origin (method url-fetch) @@ -60410,13 +60410,12 @@ fragment of code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1a9lvibgi42mhmgafp747mvshsq6ybx6rzcjqh398rfp9wg7vqih")))) + "17jlqzfhimsk8w37ifjwnm86nwjzawlbgwmwc7nhwdwslv5hz7ng")))) (build-system cargo-build-system) (arguments - ;; XXX: three test failures, e.g.: - ;; error: cannot find derive macro `Deserialize` in this scope - `(#:tests? #false - #:cargo-inputs + `(#:cargo-inputs + (("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://serde.rs") (synopsis "Generic serialization/deserialization framework") -- cgit v1.2.3 From 35ebd464c35c5e74c5c1f04a6f823f15fade9c7d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:40:03 +0300 Subject: gnu: rust-serde-derive-1: Update to 1.0.188. * gnu/packages/crates-io.scm (rust-serde-derive-1): Update to 1.0.188. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f248a30630..10439ab354 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60775,7 +60775,7 @@ TOML/JSON/MessagePack strings and serializable values.") (define-public rust-serde-derive-1 (package (name "rust-serde-derive") - (version "1.0.171") + (version "1.0.188") (source (origin (method url-fetch) @@ -60783,7 +60783,7 @@ TOML/JSON/MessagePack strings and serializable values.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10j6s97fk7fgjiqhhrx6a44rqxr7v3w985i3avx4d36i7dh9961q")))) + "1wjaclvsfxgqnnnykllvb5gffsxynk66x6h4c1ds6anq8b37mjjf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From f725b3d6bd801871cf0a29be6d4474c964557dc0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:40:33 +0300 Subject: gnu: Add rust-serial-test-1. * gnu/packages/crates-io.scm (rust-serial-test-1): New variable. (rust-serial-test-0.6): Inherit from rust-serial-test-1. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 10439ab354..26ed30cb8c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61409,8 +61409,40 @@ for later processing.") for data that potentially contains secrets (e.g. cryptographic keys).") (license (list license:asl2.0 license:expat)))) +(define-public rust-serial-test-1 + (package + (name "rust-serial-test") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04864v5ain4nan2k5l32sr3bxpg0sfxxs2iki3xxcq78g9s3132k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dashmap" ,rust-dashmap-5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-fslock" ,rust-fslock-0.2) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serial-test-derive" ,rust-serial-test-derive-1)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/palfrey/serial_test") + (synopsis "Allows for the creation of serialised Rust tests") + (description + "This package allows for the creation of serialised Rust tests.") + (license license:expat))) + (define-public rust-serial-test-0.6 (package + (inherit rust-serial-test-1) (name "rust-serial-test") (version "0.6.0") (source @@ -61421,19 +61453,13 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (string-append name "-" version ".tar.gz")) (sha256 (base32 "05gcah6s133r44y4z5qskx7prs1vjlzgv06h4l2xb8gp30fw9g75")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) ("rust-fslock" ,rust-fslock-0.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-serial-test-derive" ,rust-serial-test-derive-0.6)))) - (home-page "https://github.com/palfrey/serial_test") - (synopsis "Allows for the creation of serialised Rust tests") - (description - "This package allows for the creation of serialised Rust tests.") - (license license:expat))) + ("rust-serial-test-derive" ,rust-serial-test-derive-0.6)))))) (define-public rust-serial-test-0.5 (package -- cgit v1.2.3 From 32ad241955f53598925cf33edf9185cdea8e71f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:40:59 +0300 Subject: gnu: Add rust-serial-test-derive-1. * gnu/packages/crates-io.scm (rust-serial-test-derive-1): New variable. (rust-serial-test-derive-0.6): Inherit from rust-serial-test-derive-1. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 26ed30cb8c..a9e458f621 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61498,8 +61498,34 @@ for data that potentially contains secrets (e.g. cryptographic keys).") `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) +(define-public rust-serial-test-derive-1 + (package + (name "rust-serial-test-derive") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0scscldvlz3an9v0spcizaqp5wa2y4w15bk4ink8jpgq2pgq76h7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9)))) + (home-page "https://github.com/palfrey/serial_test") + (synopsis "Helper crate for serial_test") + (description + "This package is an helper crate for @code{rust-serial-test}.") + (license license:expat))) + (define-public rust-serial-test-derive-0.6 (package + (inherit rust-serial-test-derive-1) (name "rust-serial-test-derive") (version "0.6.0") (source @@ -61509,7 +61535,6 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1s6aj2bs0rr8hnralx16bvbqlbrihmii7cyplggk5yv0gp6vr098")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro-error" ,rust-proc-macro-error-1) @@ -61519,12 +61544,7 @@ for data that potentially contains secrets (e.g. cryptographic keys).") ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-trybuild" ,rust-trybuild-1)))) - (home-page "https://github.com/palfrey/serial_test") - (synopsis "Helper crate for serial_test") - (description - "This package is an helper crate for @code{rust-serial-test}.") - (license license:expat))) + ("rust-trybuild" ,rust-trybuild-1)))))) (define-public rust-serial-test-derive-0.5 (package -- cgit v1.2.3 From 38cbcdca8f078d0f12cc076615b64fbc9a3ced96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:41:24 +0300 Subject: gnu: Add rust-servo-arc-0.2. * gnu/packages/crates-io.scm (rust-servo-arc-0.2): New variable. (rust-servo-arc-0.1): Inherit from rust-servo-arc-0.2. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a9e458f621..60cd050c16 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61585,8 +61585,33 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-servo-arc-0.2 + (package + (name "rust-servo-arc") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-arc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hgp453zvrj7ry501jhxlcph0hc42gc26zyfwn8ys3yziwps8anm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nodrop" ,rust-nodrop-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) + (home-page "https://github.com/servo/servo") + (synopsis "Fork of std::sync::Arc with some extra functionality") + (description + "This package provides a fork of @code{std::sync::Arc} with some extra +functionality and without weak references.") + (license (list license:expat license:asl2.0)))) + (define-public rust-servo-arc-0.1 (package + (inherit rust-servo-arc-0.2) (name "rust-servo-arc") (version "0.1.1") (source @@ -61598,18 +61623,11 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (sha256 (base32 "0cjljr9znwahry6p95xvd3p4pmy24wlf6gbfidnmglg002w3i0nr")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-nodrop" ,rust-nodrop-0.1) ("rust-serde" ,rust-serde-1) - ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) - (home-page "https://github.com/servo/servo") - (synopsis "Fork of std::sync::Arc with some extra functionality") - (description - "This package provides a fork of @code{std::sync::Arc} with some extra -functionality and without weak references.") - (license (list license:expat license:asl2.0)))) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))))) (define-public rust-serial-test-derive-0.4 (package -- cgit v1.2.3 From db34ebed32d8e21e82e80ee611264f5b2ae23943 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:41:59 +0300 Subject: gnu: Add rust-simba-0.8. * gnu/packages/crates-io.scm (rust-simba-0.8): New variable. (rust-simba-0.6): Inherit from rust-simba-0.8. --- gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 60cd050c16..5bff7d319b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62612,8 +62612,45 @@ for additional details.") ("rust-syn" ,rust-syn-1) ("rust-synstructure" ,rust-synstructure-0.12)))))) +(define-public rust-simba-0.8 + (package + (name "rust-simba") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "simba" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bnf7ainywmaz2z67ss1q0bjwccf80c50c50r6hlpay69z4hf586")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-cordic" ,rust-cordic-0.1) + ("rust-cuda-std" ,rust-cuda-std-0.2) + ("rust-cust-core" ,rust-cust-core-0.1) + ("rust-decimal" ,rust-decimal-2) + ("rust-fixed" ,rust-fixed-1) + ("rust-libm" ,rust-libm-0.2) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-wide" ,rust-wide-0.7)))) + (home-page "https://github.com/dimforge/simba") + (synopsis "SIMD algebra for Rust") + (description "This package provides a set of mathematical traits to +facilitate the use of SIMD-based @dfn{Array of Struct of Array} (AoSoA) storage +pattern in Rust.") + (license license:asl2.0))) + (define-public rust-simba-0.6 (package + (inherit rust-simba-0.8) (name "rust-simba") (version "0.6.0") (source @@ -62624,7 +62661,6 @@ for additional details.") (sha256 (base32 "0px0nncs3ki86pjcldz40mhvraywh7y9jypfcqqdcihs287q9dzh")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-approx" ,rust-approx-0.5) @@ -62638,13 +62674,7 @@ for additional details.") ("rust-paste" ,rust-paste-1) ("rust-rand" ,rust-rand-0.8) ("rust-serde" ,rust-serde-1) - ("rust-wide" ,rust-wide-0.7)))) - (home-page "https://github.com/dimforge/simba") - (synopsis "SIMD algebra for Rust") - (description "This package provides a set of mathematical traits to -facilitate the use of SIMD-based @dfn{Array of Struct of Array} (AoSoA) storage -pattern in Rust.") - (license license:bsd-3))) + ("rust-wide" ,rust-wide-0.7)))))) (define-public rust-simba-0.5 (package -- cgit v1.2.3 From abefbc9d73f736c385fd495cc86e0543769d53be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:42:43 +0300 Subject: gnu: rust-syn-2: Update to 2.0.37. * gnu/packages/crates-io.scm (rust-syn-2): Update to 2.0.37. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5bff7d319b..0e75f971f9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -66908,14 +66908,14 @@ interface") (define-public rust-syn-2 (package (name "rust-syn") - (version "2.0.25") + (version "2.0.37") (source (origin (method url-fetch) (uri (crate-uri "syn" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qjswb3cifay6x9l0qjpm9c42ikacpxybr9ny4npw9kl1j6grqqm")))) + "1s42ypidkj410dfc4ir7bni0r114k822j395rf342rfd0lnfy0vk")))) (build-system cargo-build-system) (arguments ;; Tests fail to compile -- cgit v1.2.3 From 7c96382ba6cf81b58d3fa477c51a3627ed784199 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:43:17 +0300 Subject: gnu: Add rust-to-shmem-derive-0.0.0. * gnu/packages/crates-io.scm (rust-to-shmem-derive-0.0.0): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0e75f971f9..0c80189567 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -70699,6 +70699,25 @@ to a style defined by John Gruber for post titles on his website ``Daring Fireball''.") (license license:expat))) +(define-public rust-to-shmem-derive-0.0.0 + (package + (name "rust-to-shmem-derive") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "to-shmem-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0z4zc81p0i5fpkil2v2jq54nmilasvr0v25q7jbv6w0nrpl5qw2b")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/servo") + (synopsis + "Trait for cloning data into a shared memory buffer (dummy package)") + (description + "Trait for cloning data into a shared memory buffer (dummy package).") + (license license:mpl2.0))) + (define-public rust-tobj-3 (package (name "rust-tobj") -- cgit v1.2.3 From 1f0b57406577b8dd4ef26249f164cdfc30e9a08c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:43:39 +0300 Subject: gnu: Add rust-to-shmem-0.0.0. * gnu/packages/crates-io.scm (rust-to-shmem-0.0.0): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c80189567..ca36dd5481 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -70699,6 +70699,25 @@ to a style defined by John Gruber for post titles on his website ``Daring Fireball''.") (license license:expat))) +(define-public rust-to-shmem-0.0.0 + (package + (name "rust-to-shmem") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "to-shmem" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12k69c7zknzmza1mkqpmd86cialbsvazz7zr4hscm0dnfzy2bvmi")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/servo") + (synopsis + "Trait for cloning data into a shared memory buffer (dummy package)") + (description + "Trait for cloning data into a shared memory buffer (dummy package).") + (license license:mpl2.0))) + (define-public rust-to-shmem-derive-0.0.0 (package (name "rust-to-shmem-derive") -- cgit v1.2.3 From c772afc39f388476d37e61adfc95533fa3cac992 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:43:59 +0300 Subject: gnu: rust-unicode-ident-1: Update to 1.0.12. * gnu/packages/crates-io.scm (rust-unicode-ident-1): Update to 1.0.12. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ca36dd5481..b9f913a800 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -75644,14 +75644,14 @@ membership for characters in Rust.") (define-public rust-unicode-ident-1 (package (name "rust-unicode-ident") - (version "1.0.8") + (version "1.0.12") (source (origin (method url-fetch) (uri (crate-uri "unicode-ident" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1x4v4v95fv9gn5zbpm23sa9awjvmclap1wh1lmikmw9rna3llip5")))) + "0jzf1znfpb2gx8nr8mvmyqs1crnv79l57nxnbiszc7xf7ynbjm1k")))) (build-system cargo-build-system) ;; Most development inputs are competing implementations ;; for benchmarks. -- cgit v1.2.3 From 8176c45ccee11c319704789aa23c289f00b04067 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:44:24 +0300 Subject: gnu: Add rust-vek-0.15. * gnu/packages/crates-io.scm (rust-vek-0.15): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9f913a800..ee676cbf2b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76808,6 +76808,36 @@ write operations.") has at least 1 element.") (license (list license:expat license:asl2.0)))) +(define-public rust-vek-0.15 + (package + (name "rust-vek") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "vek" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05xxxv4mmm587l4bj0hcclpmk3yz35ggmnhcigy4gg7rc8k8i1c0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-az" ,rust-az-1) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-image" ,rust-image-0.23) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/yoanlcq/vek") + (synopsis "Generic 2D-3D math swiss army knife for game engines") + (description + "This package provides a generic 2D-3D math swiss army knife for game +engines, with SIMD support and focus on convenience.") + (license (list license:expat license:asl2.0)))) + (define-public rust-vergen-3 (package (name "rust-vergen") -- cgit v1.2.3 From db0b317d59f1906e360bf6abfa09b2a6d58f1306 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:44:46 +0300 Subject: gnu: rust-wasm-bindgen-0.2: Update to 0.2.87. * gnu/packages/crates-io.scm (rust-wasm-bindgen-0.2): Update to 0.2.87. [source]: Update snippet to be more future-proof. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ee676cbf2b..0571b4fb22 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77468,7 +77468,7 @@ result.") (define-public rust-wasm-bindgen-0.2 (package (name "rust-wasm-bindgen") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -77476,12 +77476,12 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fx5gh0b4n6znfa3blz92wn1k4bbiysyq9m95s7rn3gk46ydry1i")) + (base32 "0hm3k42gcnrps2jh339h186scx1radqy1w7v1zwb333dncmaf1kp")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Cargo.toml" - (("=0\\.3\\.34") "^0.3.34")))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From cb189f90d32ad3a387b9fa195c35a4be2c93bf3d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:45:20 +0300 Subject: gnu: rust-wasm-bindgen-backend-0.2: Update to 0.2.87. * gnu/packages/crates-io.scm (rust-wasm-bindgen-backend-0.2): Update to 0.2.87. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0571b4fb22..71beab53c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77507,7 +77507,7 @@ result.") (define-public rust-wasm-bindgen-backend-0.2 (package (name "rust-wasm-bindgen-backend") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -77515,7 +77515,7 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ffc0wb293ha56i66f830x7f8aa2xql69a21lrasy1ncbgyr1klm")))) + (base32 "1gcsh3bjxhw3cirmin45107pcsnn0ymhkxg6bxg65s8hqp9vdwjy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 78aaa769bed9ca03438b6e34d417f390c2d5ad92 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:45:46 +0300 Subject: gnu: rust-wasm-bindgen-futures-0.4: Update to 0.4.37. * gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.4): Update to 0.4.37. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 71beab53c3..0a9f3e5222 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77535,7 +77535,7 @@ result.") (define-public rust-wasm-bindgen-futures-0.4 (package (name "rust-wasm-bindgen-futures") - (version "0.4.34") + (version "0.4.37") (source (origin (method url-fetch) @@ -77543,7 +77543,7 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0m0lnnnhs9ni4dn9vz74prsjz8bdcf8dvnznd5ljch5s279f06gj")))) + (base32 "00zagjk39g4jjjnvfh35s7w6s0p6sy88i5c7y421z7vga4hvqbf0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 86325a0c20d9cafbadc82fbf27a0fbd8b768b61c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:46:09 +0300 Subject: gnu: rust-wasm-bindgen-macro-0.2: Update to 0.2.87. * gnu/packages/crates-io.scm (rust-wasm-bindgen-macro-0.2): Update to 0.2.87. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0a9f3e5222..1ee190be9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77592,7 +77592,7 @@ result.") (define-public rust-wasm-bindgen-macro-0.2 (package (name "rust-wasm-bindgen-macro") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -77600,7 +77600,7 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1idlq28awqhq8rclb22rn5xix82w9a4rgy11vkapzhzd1dygf8ac")))) + (base32 "07cg0b6zkcxa1yg1n10h62paid59s9zr8yss214bv8w2b7jrbr6y")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; 'Async blocks are unstable' -- cgit v1.2.3 From 6080a53a8fd65f9208eb8a65a4773b5e914db81b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:46:32 +0300 Subject: gnu: rust-wasm-bindgen-macro-support-0.2: Update to 0.2.87. * gnu/packages/crates-io.scm (rust-wasm-bindgen-macro-support-0.2): Update to 0.2.87. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1ee190be9e..db9a9cbdaf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77623,7 +77623,7 @@ dependency.") (define-public rust-wasm-bindgen-macro-support-0.2 (package (name "rust-wasm-bindgen-macro-support") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -77631,7 +77631,7 @@ dependency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xm56lpi0rihh8ny7x085dgs3jdm47spgqflb98wghyadwq83zra")))) + (base32 "0yqc46pr6mlgb9bsnfdnd50qvsqnrz8g5243fnaz0rb7lhc1ns2l")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 5093b31ee84bd4baf5fddee61457e2c460fea65d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:46:56 +0300 Subject: gnu: rust-wasm-bindgen-shared-0.2: Update to 0.2.87. * gnu/packages/crates-io.scm (rust-wasm-bindgen-shared-0.2): Update to 0.2.87. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db9a9cbdaf..c121cfd797 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77650,14 +77650,14 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) (uri (crate-uri "wasm-bindgen-shared" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0pcvk1c97r1pprzfaxxn359r0wqg5bm33ylbwgjh8f4cwbvzwih0")))) + (base32 "18bmjwvfyhvlq49nzw6mgiyx4ys350vps4cmx5gvzckh91dd0sna")))) (build-system cargo-build-system) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") -- cgit v1.2.3 From a039c2f89d8016b8cdfbe8a6185625b8de8d9e61 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:47:26 +0300 Subject: gnu: rust-wasm-bindgen-test-0.3: Update to 0.3.37. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.3): Update to 0.3.37. [source]: Adjust snippet to be more future-proof. [cargo-inputs]: Add rust-gg-alloc-1. --- gnu/packages/crates-io.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c121cfd797..1eae230e84 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77669,7 +77669,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-test-0.3 (package (name "rust-wasm-bindgen-test") - (version "0.3.34") + (version "0.3.37") (source (origin (method url-fetch) @@ -77677,16 +77677,17 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02x3agz7jn517fbbvnhncajvanr0w055jhinzf49w87vz706zcvd")) + (base32 "0w86d3ykwxfh495c4a98pj3b39wwgpfffy4ys2k86kx9gqm30vkf")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Cargo.toml" - (("=0\\.3\\.34") "^0.3.34")))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-gg-alloc" ,rust-gg-alloc-1) ("rust-js-sys" ,rust-js-sys-0.3) ("rust-scoped-tls" ,rust-scoped-tls-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) -- cgit v1.2.3 From b1b05961686d8244ef9e0dc4d2879fbb6554807a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:48:20 +0300 Subject: gnu: rust-wasm-bindgen-test-macro-0.3: Update to 0.3.37. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro-0.3): Update to 0.3.37. [arguments]: Skip tests. [cargo-development-inputs]: Add rust-trybuild-1. --- gnu/packages/crates-io.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1eae230e84..7dd39330ad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77775,7 +77775,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-test-macro-0.3 (package (name "rust-wasm-bindgen-test-macro") - (version "0.3.34") + (version "0.3.37") (source (origin (method url-fetch) @@ -77783,12 +77783,15 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1s9vnkrmmq5fiv0j0ifvbs7q5ffgxwbg1r0zcryp3cdkwsd7ad07")))) + (base32 "0xd5245xixdhj33nf6xbzg85vrmjv5vhw0hf2gnk0sc3ikfr7fgc")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; could not find `wasm_bindgen_test` + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1)))) + ("rust-quote" ,rust-quote-1)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/rustwasm/wasm-bindgen") (synopsis "Internal testing macro for wasm-bindgen") (description -- cgit v1.2.3 From 4cbc20e58949783e9d00e3f4fcc135ea9be2d26e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:49:03 +0300 Subject: gnu: rust-web-sys-0.3: Update to 0.3.64. * gnu/packages/crates-io.scm (rust-web-sys-0.3): update to 0.3.64. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7dd39330ad..3826c4bc5c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77981,7 +77981,7 @@ applications.") (define-public rust-web-sys-0.3 (package (name "rust-web-sys") - (version "0.3.61") + (version "0.3.64") (source (origin (method url-fetch) @@ -77989,7 +77989,7 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "15qbbdbhyz02srvm01p0cvlh0pvmbbin9hislp0yx8rvnbs9jfz3")))) + (base32 "16r4fww3l99kxhb66hka3kxkmhhgzhnqkzdf0ay6l2i2ikpwp1cv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 21804ae4bfb918e04cf180b8e93591c539f6d7d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:49:32 +0300 Subject: gnu: Add rust-yeslogic-fontconfig-sys-4. * gnu/packages/crates-io.scm (rust-yeslogic-fontconfig-sys-4): New variable. (rust-yeslogic-fontconfig-sys-3): Inherit from rust-yeslogic-fontconfig-sys-4. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3826c4bc5c..dc15f9c9f0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80919,17 +80919,17 @@ library.") #:cargo-development-inputs (("rust-num-traits" ,rust-num-traits-0.2)))))) -(define-public rust-yeslogic-fontconfig-sys-3 +(define-public rust-yeslogic-fontconfig-sys-4 (package (name "rust-yeslogic-fontconfig-sys") - (version "3.2.0") - (source (origin - (method url-fetch) - (uri (crate-uri "yeslogic-fontconfig-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "11n3126s717rjqxhf5js3hc0qq8qv7jbicbiyszyp5yk6s8ddfzj")))) + (version "4.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "yeslogic-fontconfig-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wsgzlvgknvkjw3m02nvp3x47ccmvfri13mwqzssxgmw5g9pyrgc")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -80948,6 +80948,25 @@ library.") for locating fonts.") (license license:expat))) +(define-public rust-yeslogic-fontconfig-sys-3 + (package + (inherit rust-yeslogic-fontconfig-sys-4) + (name "rust-yeslogic-fontconfig-sys") + (version "3.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "yeslogic-fontconfig-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11n3126s717rjqxhf5js3hc0qq8qv7jbicbiyszyp5yk6s8ddfzj")))) + (arguments + `(#:cargo-inputs + (("rust-const-cstr" ,rust-const-cstr-0.3) + ("rust-dlib" ,rust-dlib-0.5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + (define-public rust-yeslogic-fontconfig-sys-2 (package (inherit rust-yeslogic-fontconfig-sys-3) -- cgit v1.2.3 From 5f10c3551bc0c136a4732925c2e26f895c26422a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 16:50:04 +0300 Subject: gnu: librsvg: Update to 2.56.4. * gnu/packages/gnome.scm (librsvg): Update to 2.56.4. [source]: Remove snippet. [cargo-inputs]: Add rust-anyhow-1, rust-clap-complete-4, rust-encoding-rs-0.8, rust-system-deps-6, rust-thiserror-1. Replace rust-cairo-rs-0.15 with 0.17, rust-clap-2 with 4, rust-cssparser-0.28 with 0.29, rust-data-url-0.1 with 0.2, rust-gdk-gdkixbuf-0.15 with 0.17, rust-gio-0.15 with 0.17, rust-glib-0.15 with 0.17, rust-markup5ever-0.10 with 0.11, rust-nalgebra-0.29 with 0.32, rust-pango-0.15 with 0.17, rust-pangocairo-0.15 with 0.17, rust-rctree-0.4 with 0.5, rust-selectors-0.23 with 0.24, rust-xml5ever-0.16 with 0.17. Remove rust-encoding-0.2. [cargo-development-inputs]: Add rust-cast-0.3, rust-pango-0.17, rust-pangocairo-0.17. Replace rust-cairo-rs-0.15 with 0.17, rust-criterion-0.3 with 0.4, rust-glib-0.15 with 0.17, rust-lopdf-0.26 with 0.29, rust-yeslogic-fontconfig-sys-3 with 4. Remove rust-test-generator-0.3. [arguments]: Adjust custom phase 'loosen-test-boundaries to changes in the test suite. --- gnu/packages/gnome.scm | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e5e1120615..865ff3b9d7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3500,7 +3500,7 @@ for dealing with different structured file formats.") (define-public librsvg (package (name "librsvg") - (version "2.54.5") + (version "2.56.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3508,10 +3508,7 @@ for dealing with different structured file formats.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "0vmfgihhf35bxn7giqiskgsflr0zxp6xyy9aynhiyk9j8l7ij0sg")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "vendor"))))) + "1xa0cxdvc6vis5ssh1i0vi2rwgcx3bll6k5i135qyd2ra77zv1za")))) (build-system cargo-build-system) (outputs '("out" "doc" "debug")) (arguments @@ -3522,55 +3519,61 @@ for dealing with different structured file formats.") (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) #:cargo-inputs - `(("rust-byteorder" ,rust-byteorder-1) - ("rust-cairo-rs" ,rust-cairo-rs-0.15) + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) ("rust-cast" ,rust-cast-0.3) ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("rust-cssparser" ,rust-cssparser-0.28) - ("rust-data-url" ,rust-data-url-0.1) - ("rust-encoding" ,rust-encoding-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-cssparser" ,rust-cssparser-0.29) + ("rust-data-url" ,rust-data-url-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-float-cmp" ,rust-float-cmp-0.9) - ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.15) - ("rust-gio" ,rust-gio-0.15) - ("rust-glib" ,rust-glib-0.15) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.17) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-itertools" ,rust-itertools-0.10) ("rust-language-tags" ,rust-language-tags-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-locale-config" ,rust-locale-config-0.3) - ("rust-markup5ever" ,rust-markup5ever-0.10) - ("rust-nalgebra" ,rust-nalgebra-0.29) + ("rust-markup5ever" ,rust-markup5ever-0.11) + ("rust-nalgebra" ,rust-nalgebra-0.32) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango" ,rust-pango-0.15) - ("rust-pangocairo" ,rust-pangocairo-0.15) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo" ,rust-pangocairo-0.17) ("rust-rayon" ,rust-rayon-1) - ("rust-rctree" ,rust-rctree-0.4) - ("rust-rgb" ,rust-rgb-0.8) + ("rust-rctree" ,rust-rctree-0.5) ("rust-regex" ,rust-regex-1) - ("rust-selectors" ,rust-selectors-0.23) + ("rust-rgb" ,rust-rgb-0.8) + ("rust-selectors" ,rust-selectors-0.24) ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-thiserror" ,rust-thiserror-1) ("rust-tinyvec" ,rust-tinyvec-1) ("rust-url" ,rust-url-2) - ("rust-xml5ever" ,rust-xml5ever-0.16)) + ("rust-xml5ever" ,rust-xml5ever-0.17)) #:cargo-development-inputs `(("rust-anyhow" ,rust-anyhow-1) ("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-cairo-rs" ,rust-cairo-rs-0.15) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) + ("rust-cast" ,rust-cast-0.3) ("rust-chrono" ,rust-chrono-0.4) - ("rust-criterion" ,rust-criterion-0.3) - ("rust-glib" ,rust-glib-0.15) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) - ("rust-lopdf" ,rust-lopdf-0.26) + ("rust-lopdf" ,rust-lopdf-0.29) ("rust-matches" ,rust-matches-0.1) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo" ,rust-pangocairo-0.17) ("rust-png" ,rust-png-0.17) ("rust-predicates" ,rust-predicates-2) ("rust-proptest" ,rust-proptest-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tempfile" ,rust-tempfile-3) - ("rust-test-generator" ,rust-test-generator-0.3) - ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-2)) + ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-4)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-gdk-pixbuf-thumbnailer @@ -3594,12 +3597,9 @@ for dealing with different structured file formats.") ;; Increase reftest tolerance a bit to account for different ;; harfbuzz, pango, etc. (setenv "RSVG_TEST_TOLERANCE" "20") - ;; These two tests even fail after loosening the tolerance. - (for-each delete-file - '("tests/fixtures/reftests/bugs/730-font-scaling.svg" - "tests/fixtures/reftests/bugs/730-font-scaling-ref.png" - "tests/fixtures/reftests/svg1.1/text-text-03-b.svg" - "tests/fixtures/reftests/svg1.1/text-text-03-b-ref.png")))) + ;; This test fails even after loosening the tolerance. + (substitute* "tests/src/reference.rs" + ((".*svg1_1_text_align_03_b_svg.*") "")))) (add-before 'configure 'pre-configure (lambda* (#:key outputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" -- cgit v1.2.3 From 020aca2a1f5720f9ebe45a6c389e2567d15b3885 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 19:48:59 +0300 Subject: gnu: rust: Wrap rust-analyzer with rust source. * gnu/packages/rust.scm (rust)[outputs]: Add rust-src output. [arguments]: Add a phase to install the rust sources and a phase to wrap the rust-analyzer binary with the path to the rust sources. --- gnu/packages/rust.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 34511f283e..0dc60c8991 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -760,7 +760,7 @@ safety and thread safety guarantees.") (let ((base-rust rust-1.70)) (package (inherit base-rust) - (outputs (cons "tools" (package-outputs base-rust))) + (outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:tests? _ #f) @@ -919,7 +919,21 @@ safety and thread safety guarantees.") (format #f "prefix = ~s" (assoc-ref outputs "tools")))) (invoke "./x.py" "install" "clippy") (invoke "./x.py" "install" "rust-analyzer") - (invoke "./x.py" "install" "rustfmt"))))))) + (invoke "./x.py" "install" "rustfmt"))) + (add-after 'install 'install-rust-src + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "rust-src")) + (dest "/lib/rustlib/src/rust")) + (mkdir-p (string-append out dest)) + (copy-recursively "library" (string-append out dest "/library")) + (copy-recursively "src" (string-append out dest "/src"))))) + (add-after 'install-rust-src 'wrap-rust-analyzer + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "tools") + "/bin/rust-analyzer") + `("RUST_SRC_PATH" ":" = + (,(string-append (assoc-ref outputs "rust-src") + "/lib/rustlib/src/rust/library")))))))))) ;; Add test inputs. (native-inputs (cons* `("gdb" ,gdb/pinned) `("procps" ,procps) -- cgit v1.2.3 From 373283e837cb601606f314fd18b3a07ae7bce695 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:06:00 +0300 Subject: gnu: rust-bitflags-2: Update to 2.4.0. * gnu/packages/crates-io.scm (rust-bitflags-2): Update to 2.4.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc15f9c9f0..3bd1688f2c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7737,14 +7737,14 @@ types.") (define-public rust-bitflags-2 (package (name "rust-bitflags") - (version "2.3.3") + (version "2.4.0") (source (origin (method url-fetch) (uri (crate-uri "bitflags" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hifjw3191g3w5cwqqvbx8knrr3zchdwfc3rs6mn11p5si9yf2v3")))) + (base32 "0dc6xa7flfl59makmhixjcrslwlvdxxwrgxbr8p7bkvz53k2ls5l")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. -- cgit v1.2.3 From 534b0bda7315cbfbef3708e9595296996eaec066 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:06:29 +0300 Subject: gnu: rust-curl-sys-0.4: Update to 0.4.66. * gnu/packages/crates-io.scm (rust-curl-sys-0.4): Update to 0.4.66. [cargo-inputs]: Remove rust-winapi-0.3. Add rust-windows-sys-0.48. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3bd1688f2c..3fc716f30f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17632,7 +17632,7 @@ requests.") (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") - (version "0.4.63+curl-8.1.2") + (version "0.4.66+curl-8.3.0") (source (origin (method url-fetch) @@ -17640,7 +17640,7 @@ requests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p3inybj3yb8wwnccg8jwfwsqg0fiybh9837mpia28k00kvzxc5f")) + "1fdmdny7zqz5l9c9lnbnjz9i8qzdnrm8mnhdv45f9w1hx1r4mi3h")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "curl"))))) @@ -17655,7 +17655,7 @@ requests.") ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-rustls-ffi" ,rust-rustls-ffi-0.8) ("rust-vcpkg" ,rust-vcpkg-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) (native-inputs (list pkg-config)) (inputs -- cgit v1.2.3 From 680c7b0ccdb1e58ca9e010bd96f509f8bee88383 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:07:20 +0300 Subject: gnu: Add rust-fastrand-2. * gnu/packages/crates-io.scm (rust-fastrand-2): New variable. (rust-fastrand-1): Inherit from rust-fastrand-2. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3fc716f30f..86bbc1fddd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24036,33 +24036,54 @@ floats.") (description "This package provides a parser for fastq files.") (license license:expat))) -(define-public rust-fastrand-1 +(define-public rust-fastrand-2 (package (name "rust-fastrand") - (version "1.9.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (crate-uri "fastrand" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gh12m56265ihdbzh46bhh0jf74i197wm51jg1cw75q7ggi96475")))) + (base32 "19flpv5zbzpf0rk4x77z4zf25in0brg8l7m304d3yrf47qvwxjr5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-instant" ,rust-instant-0.1)) + (("rust-getrandom" ,rust-getrandom-0.2)) #:cargo-development-inputs (("rust-getrandom" ,rust-getrandom-0.2) - ("rust-instant" ,rust-instant-0.1) ("rust-rand" ,rust-rand-0.8) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) ("rust-wyhash" ,rust-wyhash-0.5)))) - (home-page "https://github.com/stjepang/fastrand") + (home-page "https://github.com/smol-rs/fastrand") (synopsis "Simple and fast random number generator") (description "This package provides a simple and fast random number generator.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fastrand-1 + (package + (inherit rust-fastrand-2) + (name "rust-fastrand") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fastrand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gh12m56265ihdbzh46bhh0jf74i197wm51jg1cw75q7ggi96475")))) + (arguments + `(#:cargo-inputs + (("rust-instant" ,rust-instant-0.1)) + #:cargo-development-inputs + (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-instant" ,rust-instant-0.1) + ("rust-rand" ,rust-rand-0.8) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-wyhash" ,rust-wyhash-0.5)))))) + (define-public rust-fat-macho-0.4 (package (name "rust-fat-macho") -- cgit v1.2.3 From cdfd8e3706738d6e80673e566e2d75b9258bf624 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:07:48 +0300 Subject: gnu: rust-unicode-width-0.1: Update to 0.1.11. * gnu/packages/crates-io.scm (rust-unicode-width-0.1): Update to 0.1.11. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 86bbc1fddd..20dcd2c009 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -75765,7 +75765,7 @@ boundaries according to Unicode Standard Annex #29 rules.") (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") - (version "0.1.10") + (version "0.1.11") (source (origin (method url-fetch) @@ -75773,7 +75773,7 @@ boundaries according to Unicode Standard Annex #29 rules.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12vc3wv0qwg8rzcgb9bhaf5119dlmd6lmkhbfy1zfls6n7jx3vf0")))) + "11ds4ydhg8g7l06rlmh712q41qsrd0j0h00n1jm74kww3kqk65z5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From a1d86a2a538d646db032bd14e6b54525093e4b0e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:08:13 +0300 Subject: gnu: rust-url-2: Update to 2.4.1. * gnu/packages/crates-io.scm (rust-url-2): Update to 2.4.1. [cargo-development-inputs]: Remove rust-debugger-test-0.1, rust-debugger-test-parser-0.1. Add rust-serde-1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 20dcd2c009..f3febd6326 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76170,7 +76170,7 @@ comparable to calling @code{unwrap_err()}.") (define-public rust-url-2 (package (name "rust-url") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) @@ -76179,7 +76179,7 @@ comparable to calling @code{unwrap_err()}.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jw89ack5ldvajpzsvhq9sy12y2xqa2x0cbin62hl80r3s1zggsh")))) + "1rbsx1nvz5ardf0x815639z1bxbbgjjjhj0mmnfaqzr5327m6fql")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76189,8 +76189,7 @@ comparable to calling @code{unwrap_err()}.") ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-debugger-test" ,rust-debugger-test-0.1) - ("rust-debugger-test-parser" ,rust-debugger-test-parser-0.1) + ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/servo/rust-url") (synopsis "URL library for Rust, based on the WHATWG URL Standard") -- cgit v1.2.3 From 3d73bb64f6202ca97203317c8ed6fec5a97daa51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:09:00 +0300 Subject: gnu: rust-xdg-2: Update to 2.5.2. * gnu/packages/crates-io.scm (rust-xdg-2): Update to 2.5.2. [cargo-inputs]: Remove rust-home-0.5. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f3febd6326..410583c4b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -80452,19 +80452,18 @@ extended attributes.") (define-public rust-xdg-2 (package (name "rust-xdg") - (version "2.5.0") + (version "2.5.2") (source (origin (method url-fetch) (uri (crate-uri "xdg" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vkzfsy3n85qnn1076h9111jg3h7k9r99jqi8nnrq3kmbbdrg1b8")))) + (base32 "0im5nzmywxjgm2pmb48k0cc9hkalarz57f1d9d0x4lvb6cj76fr1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-home" ,rust-home-0.5) - ("rust-serde" ,rust-serde-1)) + (("rust-serde" ,rust-serde-1)) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check -- cgit v1.2.3 From 9561d792f5ef47606d55ccf8b02590a1bf8e4e14 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:09:36 +0300 Subject: gnu: newsboat: Update to 2.33. * gnu/packages/syndication.scm (newsboat): Update to 2.33. [arguments]: Don't override vendor-dir. [cargo-inputs]: Replace rust-fastrand-1 with 2. --- gnu/packages/syndication.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index ac00d396b5..5a9d5ed480 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -224,14 +224,14 @@ cards.") (define-public newsboat (package (name "newsboat") - (version "2.32") + (version "2.33") (source (origin (method url-fetch) (uri (string-append "https://newsboat.org/releases/" version "/newsboat-" version ".tar.xz")) (sha256 - (base32 "1rp67fqsnsknlhlq75vgdjg9rggx8j7wbmixvps967m2f92m2qsv")))) + (base32 "1yilrfa8h63x24mcl8a6a17fsaa12imhl337br7g2dw3c1g0v78p")))) (build-system cargo-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -252,7 +252,6 @@ cards.") `(#:modules ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) - #:vendor-dir "vendor" #:install-source? #f #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) @@ -261,7 +260,7 @@ cards.") ("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-cxx" ,rust-cxx-1) ("rust-cxx-build" ,rust-cxx-build-1) - ("rust-fastrand" ,rust-fastrand-1) + ("rust-fastrand" ,rust-fastrand-2) ("rust-gettext-rs" ,rust-gettext-rs-0.7) ("rust-lexopt" ,rust-lexopt-0.3) ("rust-libc" ,rust-libc-0.2) -- cgit v1.2.3 From beb9c067391147ff5c4e9bf10a87f48b896f3447 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:39:35 +0300 Subject: gnu: Add rust-miniz-oxide-0.7. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.7): New variable. (rust-miniz-oxide-0.6): Inherit from rust-miniz-oxide-0.7. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 410583c4b1..8ab4ed1591 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39356,16 +39356,17 @@ efficient round-trip float parsing. Minimal-lexical implements a correct, fast float parser.") (license (list license:expat license:asl2.0)))) -(define-public rust-miniz-oxide-0.6 +(define-public rust-miniz-oxide-0.7 (package (name "rust-miniz-oxide") - (version "0.6.4") - (source (origin - (method url-fetch) - (uri (crate-uri "miniz-oxide" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "08j82769wkgbzfpg0k2qa744w3sg79vx1vsmjw88p1yy5rc15qpj")))) + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz-oxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ivl3rbbdm53bzscrd01g60l46lz5krl270487d8lhjvwl5hx0g7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -39382,6 +39383,25 @@ float parser.") streaming API for miniz_oxide.") (license (list license:expat license:zlib license:asl2.0)))) +(define-public rust-miniz-oxide-0.6 + (package + (inherit rust-miniz-oxide-0.7) + (name "rust-miniz-oxide") + (version "0.6.4") + (source (origin + (method url-fetch) + (uri (crate-uri "miniz-oxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08j82769wkgbzfpg0k2qa744w3sg79vx1vsmjw88p1yy5rc15qpj")))) + (arguments + `(#:cargo-inputs + (("rust-adler" ,rust-adler-1) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-simd-adler32" ,rust-simd-adler32-0.3)))))) + (define-public rust-miniz-oxide-0.5 (package (inherit rust-miniz-oxide-0.6) -- cgit v1.2.3 From b38a0bcb75b48bcb40517152221f242050f9b669 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:40:23 +0300 Subject: gnu: rust-clang-ast-0.1: Update to 0.1.20. * gnu/packages/crates-io.scm (rust-clang-ast-0.1): Update to 0.1.20. [arguments]: Don't skip build. Skip tests. [cargo-inputs]: Add rust-rustc-hash-1. [cargo-development-inputs]: Add rust-rustversion-1, rust-rust-serde-derive-1. Remove rust-serde-1. --- gnu/packages/crates-io.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8ab4ed1591..cb8d304126 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11965,24 +11965,24 @@ usage.") (define-public rust-clang-ast-0.1 (package (name "rust-clang-ast") - (version "0.1.6") + (version "0.1.20") (source (origin (method url-fetch) (uri (crate-uri "clang-ast" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1sfqyxszas78s78nga88fl0i5qlr87qsj22vlxarhvx96q86impf")))) + (base32 "04qf9kpc2r3ca7c5x8bjp1daj42k69q12q8mz7bhajbm9rpafb8m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; Uses unstable features. + `(#:tests? #f ; Fails to build clang-ast-test-suite. #:cargo-inputs - (("rust-serde" ,rust-serde-1)) + (("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-clang-ast-test-suite" ,rust-clang-ast-test-suite-0.0.0) - ("rust-serde" ,rust-serde-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/dtolnay/clang-ast") (synopsis "Data structures for processing Clang's ast format") -- cgit v1.2.3 From 3ed5d0a298015940bb38192d954c93b7440904ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:41:56 +0300 Subject: gnu: rust-cxx-1: Update to 1.0.107. * gnu/packages/crates-io.scm (rust-cxx-1): Update to 1.0.107. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb8d304126..54469860c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17830,7 +17830,7 @@ attributes.") (define-public rust-cxx-1 (package (name "rust-cxx") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -17839,7 +17839,7 @@ attributes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yc5gz723hiwqk7waygj63655fh5vzq3551p1j2wyzc06xf0glai")))) + "1gpz9si4nn236rqbmrsxd0dl4ksdfwrf1rdyncyznmlxg2hqpsdv")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Cannot compile cxx-test-suite. -- cgit v1.2.3 From 388885e67a75eb02e91dde7e1509af75070cad9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:42:22 +0300 Subject: gnu: rust-cxx-build-1: Update to 1.0.107. * gnu/packages/crates-io.scm (rust-cxx-build-1): Update to 1.0.107. [cargo-inputs]: Add rust-once-cell-1. Replace rust-syn-1 with 2. Remove rust-lazy-static-1. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 54469860c9..022414ca8d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17890,7 +17890,7 @@ attributes.") (define-public rust-cxx-build-1 (package (name "rust-cxx-build") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -17899,17 +17899,17 @@ attributes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0w5a2wdkdh44gmi0psynaazx4j7d1947sr7nyaccayxjc4gjhi2h")))) + "18sy8llakggzyahmr7c25l16i63hd2agpb8x3f2a8ga3p3v21kn4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) - ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-once-cell" ,rust-once-cell-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-scratch" ,rust-scratch-1) - ("rust-syn" ,rust-syn-1)) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-cxx" ,rust-cxx-1) ("rust-cxx-gen" ,rust-cxx-gen-0.7) -- cgit v1.2.3 From 4f8160af253a271e1154b0363f85eda169e3ee2b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:43:07 +0300 Subject: gnu: rust-cxx-gen-0.7: Update to 0.7.107. * gnu/packages/crates-io.scm (rust-cxx-gen-0.7): Update to 0.7.107. [cargo-inputs]: Replace rust-syn-1 with 2. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 022414ca8d..c150cb9a4e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17951,7 +17951,7 @@ crate into a Cargo build.") (define-public rust-cxx-gen-0.7 (package (name "rust-cxx-gen") - (version "0.7.86") + (version "0.7.107") (source (origin (method url-fetch) @@ -17960,14 +17960,14 @@ crate into a Cargo build.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z08a3c4xpnz91a4nc2b4f2kbmadjrrimr8awx1k4g0rmjdmq5mr")))) + "1lv2fs3s51lqipbpzrv2dmhm0mwcw5205sq7x3cmcb3skia64l6b")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-codespan-reporting" ,rust-codespan-reporting-0.11) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)))) (home-page "https://cxx.rs") (synopsis "C++ code generator") (description -- cgit v1.2.3 From b052bf63844944e861a4619126b4249039cb7f1c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:43:46 +0300 Subject: gnu: rust-cxxbridge-flags-1: Update to 1.0.107. * gnu/packages/crates-io.scm (rust-cxxbridge-flags-1): Update to 1.0.107. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c150cb9a4e..4a98da57d5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18020,7 +18020,7 @@ crate into higher level tools.") (define-public rust-cxxbridge-flags-1 (package (name "rust-cxxbridge-flags") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -18029,7 +18029,7 @@ crate into higher level tools.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "073qx3gnf8df9xzfy9xfcz9b79m0638x4a0isfq2fb527g4hpdb1")))) + "18hxm7dp8k58zsxniaspg11nw0ymwzpk1viw8zzy56123ng8v210")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/cxx") (synopsis "Compiler configuration of the `cxx` crate") -- cgit v1.2.3 From 1da3019977f4d3882c97cc1ab50c9385275290da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:44:19 +0300 Subject: gnu: rust-cxxbridge-macro-1: Update to 1.0.107. * gnu/packages/crates-io.scm (rust-cxxbridge-macro-1): Update to 1.0.107. [cargo-inputs]: Add rust-serde-derive-1. Replace rust-syn-1 with 2. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a98da57d5..6a37688b4c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18055,7 +18055,7 @@ crate (implementation detail).") (define-public rust-cxxbridge-macro-1 (package (name "rust-cxxbridge-macro") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -18064,7 +18064,7 @@ crate (implementation detail).") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "19c7pjvjll72yb9wyrmpdylwqglizn8kayww8qcm24b2gvd1zrir")))) + "116d3i750nknl6jw9vmvyxrndrmwn5gm7zzxzx6rw4jqvmq6m89g")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -18074,8 +18074,9 @@ crate (implementation detail).") ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-syn" ,rust-syn-1)) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-cxx" ,rust-cxx-1)))) (home-page "https://cxx.rs") -- cgit v1.2.3 From 011805e3b15e69e1af2e62ab26e3d5399b9db536 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:45:27 +0300 Subject: gnu: rust-flate2-1: Update to 1.0.27. * gnu/packages/crates-io.scm (rust-flate2-1): Update to 1.0.27. [cargo-inputs]: Replace rust-miniz-oxide-0.6 with 0.7. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6a37688b4c..7c0d63f7b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24965,16 +24965,14 @@ test multiple times.") (define-public rust-flate2-1 (package (name "rust-flate2") - (version "1.0.25") + (version "1.0.27") (source (origin (method url-fetch) (uri (crate-uri "flate2" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0hg8ih51lx5xkz2zlzpsy1j1xka8gs8vhk2964ppgj5ighwxp8m8")))) + (base32 "045hvzdv3159qqjlgr5i3p4d346briddkipwyb5iv7ay17l8xjf6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -24982,7 +24980,7 @@ test multiple times.") ("rust-crc32fast" ,rust-crc32fast-1) ("rust-libz-ng-sys" ,rust-libz-ng-sys-1) ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-miniz-oxide" ,rust-miniz-oxide-0.6)) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.7)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8)))) -- cgit v1.2.3 From 7b90bdbcef6afb07badfd5b15c31bd0926395c77 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:46:08 +0300 Subject: gnu: rust-link-cplusplus-1: Update to 1.0.9. * gnu/packages/crates-io.scm (rust-link-cplusplus-1): Update to 1.0.9. --- gnu/packages/crates-io.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c0d63f7b3..0034908e57 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36357,16 +36357,14 @@ to count the number of lines in a file.") (define-public rust-link-cplusplus-1 (package (name "rust-link-cplusplus") - (version "1.0.8") + (version "1.0.9") (source - (origin - (method url-fetch) - (uri (crate-uri "link-cplusplus" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x84vvg7gn94x9zrvd67602h3ricmhlv19cpl2alzhqkqz4hglpc")))) + (origin + (method url-fetch) + (uri (crate-uri "link-cplusplus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jc56xf51f3fn5hvppsj9c2pa0fxm7k79xs90a5s58qvgrphq94x")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cc" ,rust-cc-1)))) -- cgit v1.2.3 From 9d726a2151deff117f03b7ee08e7bdc9a9caebda Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:46:38 +0300 Subject: gnu: rust-miniz-oxide-0.6: Downgrade to 0.6.2. Later versions of this crate were yanked upstream. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.6): Downgrade to 0.6.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0034908e57..5385339c65 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39384,13 +39384,13 @@ streaming API for miniz_oxide.") (package (inherit rust-miniz-oxide-0.7) (name "rust-miniz-oxide") - (version "0.6.4") + (version "0.6.2") (source (origin (method url-fetch) (uri (crate-uri "miniz-oxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08j82769wkgbzfpg0k2qa744w3sg79vx1vsmjw88p1yy5rc15qpj")))) + (base32 "1yp8z6yll5ypz1ldmgnv7zi0r78kbvmqmn2mii77jzmk5069axdj")))) (arguments `(#:cargo-inputs (("rust-adler" ,rust-adler-1) -- cgit v1.2.3 From 4ada2304ccd40a9b1c606f91b4d970cdf347f1ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:47:18 +0300 Subject: gnu: rust-miniz-oxide-0.5: Update to 0.5.4. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.5): Update to 0.5.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5385339c65..e580d15f3d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39403,14 +39403,14 @@ streaming API for miniz_oxide.") (package (inherit rust-miniz-oxide-0.6) (name "rust-miniz-oxide") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (crate-uri "miniz_oxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1k1wfxb35v129mhqy14yqhrj3wvknafrwygiq7zvi0m5iml7ap3g")))) + (base32 "0d2xcypr8s0skd81dhlrylas1j794qyz74snm11jc8kmy6l0nncn")))) (arguments `(#:cargo-inputs (("rust-adler" ,rust-adler-1) -- cgit v1.2.3 From 0ab59fa845ced1d6a3701f0e747a4f44e43f87ab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:47:41 +0300 Subject: gnu: rust-miniz-oxide-0.4: Update to 0.4.4. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.4): Update to 0.4.4. [cargo-inputs]: Replace rust-adler-0.2 with 1. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e580d15f3d..b17b470106 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39423,17 +39423,17 @@ streaming API for miniz_oxide.") (package (inherit rust-miniz-oxide-0.5) (name "rust-miniz-oxide") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "miniz_oxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g")))) + (base32 "0jsfv00hl5rmx1nijn59sr9jmjd4rjnjhh4kdjy8d187iklih9d9")))) (arguments `(#:cargo-inputs - (("rust-adler" ,rust-adler-0.2) + (("rust-adler" ,rust-adler-1) ("rust-autocfg" ,rust-autocfg-1) ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) -- cgit v1.2.3 From a34b528180ebc592169834025a5bf875f8a6db08 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:48:17 +0300 Subject: gnu: rust-miniz-oxide-0.3: Update to 0.3.7. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.3): Update to 0.3.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b17b470106..111038f481 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39443,7 +39443,7 @@ streaming API for miniz_oxide.") (package (inherit rust-miniz-oxide-0.4) (name "rust-miniz-oxide") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -39451,7 +39451,7 @@ streaming API for miniz_oxide.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "198n4hfpq0qcxf275l6fpzh7b9cl7ck2xs6pjgpds74bazv9yrxa")))) + "0dblrhgbm0wa8jjl8cjp81akaj36yna92df4z1h9b26n3spal7br")))) (arguments `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1)))))) -- cgit v1.2.3 From d1aaf907d8be60792c1834207125279cb4f3eac7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:48:41 +0300 Subject: gnu: rust-pkg-config-0.3: Update to 0.3.27. * gnu/packages/crates-io.scm (rust-pkg-config-0.3): Update to 0.3.27. [arguments]: Fix typo in custom phase name. Remove trailing #t from phases. --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 111038f481..81e075b7c6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48740,7 +48740,7 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).") (define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") - (version "0.3.26") + (version "0.3.27") (source (origin (method url-fetch) @@ -48748,20 +48748,19 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q2i61dhqvawc51zfzl3jich57w0cjgfa894hn6ings7ffgsbjba")))) + "0r39ryh1magcq4cz5g9x88jllsnxnhcqr753islvyk4jp9h2h1r6")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'hardcode-pkg-config-loation + (add-after 'unpack 'hardcode-pkg-config-location (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/lib.rs" (("\"pkg-config\"") (string-append "\"" (assoc-ref inputs "pkg-config") - "/bin/pkg-config\""))) - #t))))) + "/bin/pkg-config\"")))))))) (native-inputs (list pkg-config)) (home-page "https://github.com/rust-lang/pkg-config-rs") -- cgit v1.2.3 From 1ad8b5d6122f7022e77ba5add8c60ded6871627d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 1 Oct 2023 21:49:16 +0300 Subject: gnu: rust-scratch-1: Update to 1.0.7. * gnu/packages/crates-io.scm (rust-scratch-1): Update to 1.0.7. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 81e075b7c6..c320ca63b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59171,16 +59171,14 @@ for browser-grade parsing and querying.") (define-public rust-scratch-1 (package (name "rust-scratch") - (version "1.0.0") + (version "1.0.7") (source (origin (method url-fetch) (uri (crate-uri "scratch" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0sff4rvfalp0ip98pl3xa32n7lhzcr4zqn8fgamaalbb64v4a4by")))) + (base32 "0lk160986gamss2rxi746nj747xx7gg8r2hfskrr9fccqc8prkx3")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From afad2e9d8f269c4eaa78cdc167d2482f592142e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:01:18 +0300 Subject: gnu: rust-libc-0.2: Update to 0.2.148. * gnu/packages/crates-io.scm (rust-libc-0.2): Update to 0.2.148. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c320ca63b5..f332304031 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35222,14 +35222,14 @@ parser in Rust.") (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.144") + (version "0.2.148") (source (origin (method url-fetch) (uri (crate-uri "libc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qfzrwhncsradwvdzd8vsj4mc31fh0rb5rvny3884rwa48fcq01b")))) + (base32 "16rn9l8s5sj9n2jb2pw13ghqwa5nvjggkh9q3lp6vs1jfghp3p4w")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs -- cgit v1.2.3 From 2a87ab305e02ce4cd9ec14270d1c1a78ed868371 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:01:50 +0300 Subject: gnu: Add rust-linux-raw-sys-0.4. * gnu/packages/crates-io.scm (rust-linux-raw-sys-0.4): New variable. (rust-linux-raw-sys-0.3): Inherit from rust-linux-raw-sys-0.4. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f332304031..3eec57ef24 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36494,17 +36494,17 @@ facility. Provides a safe interface around the raw system calls allowing user-space programs to perform key manipulation.") (license (list license:asl2.0 license:expat)))) -(define-public rust-linux-raw-sys-0.3 +(define-public rust-linux-raw-sys-0.4 (package (name "rust-linux-raw-sys") - (version "0.3.7") - (source (origin - (method url-fetch) - (uri (crate-uri "linux-raw-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "17s7qr5h82blrxy29014zzhr30jcxcjc8r16v2p31rzcfal7xsgc")))) + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "linux-raw-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nw8dqdhai0c7r701bicj3y6vrwc7dgbx9lbcw29ijnr7d562liq")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -36522,6 +36522,26 @@ Linux userspace APIs.") ;; LLVM exception. See COPYRIGHT in the repository. (license (list license:asl2.0 license:expat)))) +(define-public rust-linux-raw-sys-0.3 + (package + (inherit rust-linux-raw-sys-0.4) + (name "rust-linux-raw-sys") + (version "0.3.7") + (source (origin + (method url-fetch) + (uri (crate-uri "linux-raw-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17s7qr5h82blrxy29014zzhr30jcxcjc8r16v2p31rzcfal7xsgc")))) + (arguments + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-static-assertions" ,rust-static-assertions-1)))))) + (define-public rust-linux-raw-sys-0.1 (package (inherit rust-linux-raw-sys-0.3) -- cgit v1.2.3 From 7253dda472a586a7fd776de4467fde597d5aab5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:02:17 +0300 Subject: gnu: Add rust-loom-0.7. * gnu/packages/crates-io.scm (rust-loom-0.7): New variable. (rust-loom-0.5): Inherit from rust-loom-0.7. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3eec57ef24..7d867beedd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36899,17 +36899,17 @@ by inspecting the system for user preference.") `(#:cargo-inputs (("rust-log" ,rust-log-0.4)))))) -(define-public rust-loom-0.5 +(define-public rust-loom-0.7 (package (name "rust-loom") - (version "0.5.6") - (source (origin - (method url-fetch) - (uri (crate-uri "loom" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x9hmiv00ir79kypcg0jdw0j0fkd3ymq6rpv6pli6q5qifrfql7z")))) + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "loom" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gqrw1d0kqdkjvb11ziniwhngd66awk40dr67s6wyfh7wmipk8c6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -36920,7 +36920,9 @@ by inspecting the system for user preference.") ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tracing" ,rust-tracing-0.1) - ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3)))) (home-page "https://github.com/tokio-rs/loom") (synopsis "Permutation testing for concurrent code") (description @@ -36930,6 +36932,29 @@ memory model. It uses state reduction techniques to avoid combinatorial explosion.") (license license:expat))) +(define-public rust-loom-0.5 + (package + (inherit rust-loom-0.7) + (name "rust-loom") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (crate-uri "loom" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x9hmiv00ir79kypcg0jdw0j0fkd3ymq6rpv6pli6q5qifrfql7z")))) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-generator" ,rust-generator-0.7) + ("rust-pin-utils" ,rust-pin-utils-0.1) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))))) + (define-public rust-loom-0.4 (package (name "rust-loom") -- cgit v1.2.3 From bd528653756a17bcece35fcc7fbbf2fe36f81c58 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:02:48 +0300 Subject: gnu: rust-mio-0.8: Update to 0.8.8. * gnu/packages/crates-io.scm (rust-mio-0.8): Update to 0.8.8. [cargo-inputs]: Replace rust-windows-sys-0.45 with 0.48. [cargo-development-inputs]: Replace rust-env-logger-0.8 with 0.9. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7d867beedd..011ae3dd12 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39526,23 +39526,23 @@ streaming API for miniz_oxide.") (define-public rust-mio-0.8 (package (name "rust-mio") - (version "0.8.6") + (version "0.8.8") (source (origin (method url-fetch) (uri (crate-uri "mio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ygx5chq81k3vk2bx722xwcwf2qydmm337jsnijgzd7mxx39m7av")))) + (base32 "1lhrdgcmcy8f0qy1n7357q0aprfkm5gld5mjcrp209pwsdf7cylj")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-wasi" ,rust-wasi-0.11) - ("rust-windows-sys" ,rust-windows-sys-0.45)) + ("rust-windows-sys" ,rust-windows-sys-0.48)) #:cargo-development-inputs - `(("rust-env-logger" ,rust-env-logger-0.8) + `(("rust-env-logger" ,rust-env-logger-0.9) ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/tokio-rs/mio") (synopsis "Lightweight non-blocking IO") -- cgit v1.2.3 From 29a7c0e80c0bfffc1d66658bd119448746f2b246 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:03:42 +0300 Subject: gnu: Add rust-mio-aio-0.7. * gnu/packages/crates-io.scm (rust-mio-aio-0.7): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 011ae3dd12..819124f50f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39606,6 +39606,35 @@ possible over the OS abstractions.") ("rust-env-logger" ,rust-env-logger-0.4) ("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-mio-aio-0.7 + (package + (name "rust-mio-aio") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-aio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07y7wnkd4xvj48fyxgnfm9jqjldgqfd39k3ydfmaqc76mw36pagq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; no variant named `SigevKevent` found for enum `SigevNotify` + #:cargo-inputs + (("rust-mio" ,rust-mio-0.8) + ("rust-nix" ,rust-nix-0.24)) + #:cargo-development-inputs + (("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-log" ,rust-log-0.3) + ("rust-mio" ,rust-mio-0.8) + ("rust-nix" ,rust-nix-0.24) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/asomers/mio-aio") + (synopsis "POSIX AIO bindings for mio") + (description "This package provides POSIX AIO bindings for mio.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mio-anonymous-pipes-0.2 (package (name "rust-mio-anonymous-pipes") -- cgit v1.2.3 From a9bdb6e583777591f61c589b13ca2ff72b6b9696 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:04:04 +0300 Subject: gnu: rust-nix-0.24: Update to 0.24.3. * gnu/packages/crates-io.scm (rust-nix-0.24): Update to 0.24.3. [arguments]: Don't skip build. Skip tests. [cargo-development-inputs]: Add rust-assert-impl-0.1, rust-caps-0.5, rust-lazy-static-1, rust-parkinglot-0.11, rust-rand-0.8, rust-semver-1, rust-sysctl-0.1, rust-tempfile-3. --- gnu/packages/crates-io.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 819124f50f..21519015d1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41805,21 +41805,30 @@ while still providing platform specific APIs.") (package (inherit rust-nix-0.26) (name "rust-nix") - (version "0.24.2") + (version "0.24.3") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r")))) + (base32 "0sc0yzdl51b49bqd9l9cmimp1sw1hxb8iyv4d35ww6d7m5rfjlps")))) (arguments - (list #:skip-build? #t + (list #:tests? #f ; Test suite hangs. #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.6)))))) + ("rust-memoffset" ,rust-memoffset-0.6)) + #:cargo-development-inputs + `(("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-rand" ,rust-rand-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.23 (package -- cgit v1.2.3 From d528d4da85ccb5ceb4fb86f931391462a406a89f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:05:24 +0300 Subject: gnu: rust-pin-project-lite-0.2: Update to 0.2.13. * gnu/packages/crates-io.scm (rust-pin-project-lite-0.2): Update to 0.2.13. [source]: Change snippet to not require exact version of dependencies. [cargo-development-inputs]: Add rust-once-cell-1, rust-proc-macro2-1, rust-serde-1, rust-toml-0.5. --- gnu/packages/crates-io.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21519015d1..85f98cd186 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48496,28 +48496,30 @@ crate.") (define-public rust-pin-project-lite-0.2 (package (name "rust-pin-project-lite") - (version "0.2.9") + (version "0.2.13") (source (origin (method url-fetch) (uri (crate-uri "pin-project-lite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05n1z851l356hpgqadw4ar64mjanaxq1qlwqsf2k05ziq8xax9z0")) + (base32 "0n0bwr5qxlf0mhn2xkl36sy55118s9qmvx2yl5f3ixkb007lbywa")) (modules '((guix build utils))) (snippet - '(substitute* "Cargo.toml" - (("\\[dev-dependencies.rustversion\\]" m) - (string-append " -[dev-dependencies.macrotest] -version = \"1\" -" m)))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs (("rust-macrotest" ,rust-macrotest-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-toml" ,rust-toml-0.5) ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/taiki-e/pin-project-lite") (synopsis "Lightweight version of pin-project") -- cgit v1.2.3 From 592c3ba70a183a6241dfd34b0a1c1523641a5380 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:06:43 +0300 Subject: gnu: Add rust-rustix-0.38. * gnu/packages/crates-io.scm (rust-rustix-0.38): New variable. (rust-rustix-0.37): Inherit from rust-rustix-0.38. --- gnu/packages/crates-io.scm | 68 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 85f98cd186..7dba33cdf4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -57547,8 +57547,67 @@ rustc compiler.") `(("rust-failure" ,rust-failure-0.1) ,@(alist-delete "rust-anyhow" cargo-inputs))))))) +(define-public rust-rustix-0.38 + (package + (name "rust-rustix") + (version "0.38.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cg5jsfx8lf5npjf2v5ac8fca5443hq8iqqlg2gg1yc8pl6dmyfj")) + (snippet + #~(begin + (use-modules (guix build utils)) + (for-each delete-file (find-files "." "\\.a$")) + (delete-file "Cargo.toml") + (substitute* "Cargo.toml.orig" + ;; Depend unconditionally on the cc crate + (("(cc = .*), optional = true.*" _ cc) + (string-append cc " }\n")) + ;; Disable using the linux_raw backend + (("not\\(rustic_use_libc\\)") "miri")) + (substitute* "build.rs" + ;; Always use the 'feature = "cc"' path + (("not\\(feature = \"cc\"\\)") "feature = \"foobar\"") + (("#\\[cfg\\(feature = \"cc\"\\)\\]" all) + (string-append "//" all))) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-2) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-errno" ,rust-errno-0.3) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-errno" ,rust-errno-0.3) + ("rust-flate2" ,rust-flate2-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.9) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/bytecodealliance/rustix") + (synopsis "Safe Rust bindings to POSIX syscalls") + (description + "This package provides safe Rust bindings to POSIX syscalls.") + ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat. + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustix-0.37 (package + (inherit rust-rustix-0.38) (name "rust-rustix") (version "0.37.19") (source (origin @@ -57575,7 +57634,6 @@ rustc compiler.") (("#\\[cfg\\(feature = \"cc\"\\)\\]" all) (string-append "//" all))) (copy-file "Cargo.toml.orig" "Cargo.toml"))))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -57599,13 +57657,7 @@ rustc compiler.") ("rust-libc" ,rust-libc-0.2) ("rust-memoffset" ,rust-memoffset-0.8) ("rust-serial-test" ,rust-serial-test-0.6) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/bytecodealliance/rustix") - (synopsis "Safe Rust bindings to POSIX syscalls") - (description - "This package provides safe Rust bindings to POSIX syscalls.") - ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat. - (license (list license:asl2.0 license:expat)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-rustix-0.36 (package -- cgit v1.2.3 From 9c2e509cac29d9c510a22b0023b939f7edd5e806 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:07:09 +0300 Subject: gnu: Add rust-serial-test-2. * gnu/packages/crates-io.scm (rust-serial-test-2): New variable. (rust-serial-test-1): Inherit from rust-serial-test-2. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7dba33cdf4..496f0fc93d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61581,17 +61581,17 @@ for later processing.") for data that potentially contains secrets (e.g. cryptographic keys).") (license (list license:asl2.0 license:expat)))) -(define-public rust-serial-test-1 +(define-public rust-serial-test-2 (package (name "rust-serial-test") - (version "1.0.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "serial-test" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04864v5ain4nan2k5l32sr3bxpg0sfxxs2iki3xxcq78g9s3132k")))) + (base32 "0b9v0csv9wxl1gcjq99plwimxbmhgr6kzbwqyb457qh3d22xsmhf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -61602,7 +61602,7 @@ for data that potentially contains secrets (e.g. cryptographic keys).") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-parking-lot" ,rust-parking-lot-0.12) - ("rust-serial-test-derive" ,rust-serial-test-derive-1)) + ("rust-serial-test-derive" ,rust-serial-test-derive-2)) #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.10) ("rust-tokio" ,rust-tokio-1)))) @@ -61612,6 +61612,32 @@ for data that potentially contains secrets (e.g. cryptographic keys).") "This package allows for the creation of serialised Rust tests.") (license license:expat))) +(define-public rust-serial-test-1 + (package + (inherit rust-serial-test-2) + (name "rust-serial-test") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04864v5ain4nan2k5l32sr3bxpg0sfxxs2iki3xxcq78g9s3132k")))) + (arguments + `(#:cargo-inputs + (("rust-dashmap" ,rust-dashmap-5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-fslock" ,rust-fslock-0.2) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serial-test-derive" ,rust-serial-test-derive-1)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-serial-test-0.6 (package (inherit rust-serial-test-1) -- cgit v1.2.3 From be5ddded5fa0ec83001fc936a17f6158b841e4b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:07:35 +0300 Subject: gnu: Add rust-serial-test-derive-2. * gnu/packages/crates-io.scm (rust-serial-test-derive-2): New variable. (rust-serial-test-derive-1): Inherit from rust-serial-test-derive-2. --- gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 496f0fc93d..69c0bd0588 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61696,31 +61696,51 @@ for data that potentially contains secrets (e.g. cryptographic keys).") `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) -(define-public rust-serial-test-derive-1 +(define-public rust-serial-test-derive-2 (package (name "rust-serial-test-derive") - (version "1.0.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "serial-test-derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0scscldvlz3an9v0spcizaqp5wa2y4w15bk4ink8jpgq2pgq76h7")))) + (base32 "13zvd5ds76hhjn3z0axc05n15lzpxpz77jcykic8q5knhlbjklci")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.9)))) + (("rust-env-logger" ,rust-env-logger-0.10)))) (home-page "https://github.com/palfrey/serial_test") (synopsis "Helper crate for serial_test") (description "This package is an helper crate for @code{rust-serial-test}.") (license license:expat))) +(define-public rust-serial-test-derive-1 + (package + (inherit rust-serial-test-derive-2) + (name "rust-serial-test-derive") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0scscldvlz3an9v0spcizaqp5wa2y4w15bk4ink8jpgq2pgq76h7")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9)))))) + (define-public rust-serial-test-derive-0.6 (package (inherit rust-serial-test-derive-1) -- cgit v1.2.3 From 7516b300a5bd913371ced5bcd6739e9b63f2b9b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:07:59 +0300 Subject: gnu: Add rust-socket2-0.5. * gnu/packages/crates-io.scm (rust-socket2-0.5): New variable. (rust-socket2-0.4): Inherit from rust-socket2-0.5. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 69c0bd0588..a8b80d4d55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64439,8 +64439,32 @@ It is also flexible enough to build your own test harness like @code{trycmd}.") benchmarking.") (license license:bsd-3))) +(define-public rust-socket2-0.5 + (package + (name "rust-socket2") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "socket2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17lqx8w2b3nysrkdbdz8y7fkikz5v77c052q57lxwajmxchfhca0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) + (home-page "https://github.com/rust-lang/socket2") + (synopsis "Networking sockets in Rust") + (description + "This package provides utilities for handling networking sockets with a +maximal amount of configuration possible intended.") + (license (list license:expat license:asl2.0)))) + (define-public rust-socket2-0.4 (package + (inherit rust-socket2-0.5) (name "rust-socket2") (version "0.4.7") (source @@ -64450,18 +64474,10 @@ benchmarking.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1gaf57dc16s1lfyv388w9vdl9qay15xds78jcwakml9kj3dx5qh2")))) - (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/rust-lang/socket2") - (synopsis "Networking sockets in Rust") - (description - "This package provides utilities for handling networking sockets with a -maximal amount of configuration possible intended.") - (license (list license:asl2.0 - license:expat)))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-socket2-0.3 (package -- cgit v1.2.3 From e903a207e024b00650e5d449a57f58bc7ae59172 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:08:22 +0300 Subject: gnu: rust-tokio-1: Update to 1.32.0. * gnu/packages/crates-io.scm (rust-tokio-1): Update to 1.32.0. [arguments]: Don't skip build. Skip tests. [cargo-inputs]: Add rust-backtrace-0.3. Replace rust-socket2-0.4 with 0.5, rust-tokio-macros-1 with 2, rust-windows-sys-0.45 with 0.48. Remove rust-autocfg-1. [cargo-development-inputs]: Add rust-async-stream-0.3, rust-futures-0.3, rust-libc-0.2, rust-loom-0.7, rust-mio-aio-0.7, rust-mockall-0.11, rust-nix-0.26, rust-rand-0.8, rust-socket2-0.5, rust-tempfile-3, rust-tokio-stream-0.1, rust-tokio-test-0.4, rust-wasm-bindgen-test-0.3, rust-windows-sys-0.48. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a8b80d4d55..630f3e3d0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -71015,31 +71015,45 @@ tinyobjloader.") (define-public rust-tokio-1 (package (name "rust-tokio") - (version "1.26.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0r3gnz0zh669q9jm7xh8dz7irbnxjddbbrfflp42jyn2qc0is803")))) + (base32 "1yck1349q23l22bgxcbqd3wkaffw2vmkf7z26m3wgmkcxmvn1v8p")))) (build-system cargo-build-system) (arguments - (list #:skip-build? #t + (list #:tests? #f ; unresolved imports `crate::runtime::task` #:cargo-inputs - `(("rust-autocfg" ,rust-autocfg-1) + `(("rust-backtrace" ,rust-backtrace-0.3) ("rust-bytes" ,rust-bytes-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memchr" ,rust-memchr-2) ("rust-mio" ,rust-mio-0.8) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-parking-lot" ,rust-parking-lot-0.12) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) - ("rust-socket2" ,rust-socket2-0.4) - ("rust-tokio-macros" ,rust-tokio-macros-1) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tokio-macros" ,rust-tokio-macros-2) ("rust-tracing" ,rust-tracing-0.1) - ("rust-windows-sys" ,rust-windows-sys-0.45)))) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs + `(("rust-async-stream" ,rust-async-stream-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-loom" ,rust-loom-0.7) + ("rust-mio-aio" ,rust-mio-aio-0.7) + ("rust-mockall" ,rust-mockall-0.11) + ("rust-nix" ,rust-nix-0.26) + ("rust-rand" ,rust-rand-0.8) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) (home-page "https://tokio.rs") (synopsis "Event-driven, non-blocking I/O platform") (description -- cgit v1.2.3 From e7bf18b2cfb6532d345a09e6db5bd3ffbdf6cde4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 08:10:48 +0300 Subject: gnu: Add rust-tokio-macros-2. * gnu/packages/crates-io.scm (rust-tokio-macros-2): New variable. (rust-tokio-macros-1): Inherit from rust-tokio-macros-2. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 630f3e3d0b..fb0ca61e06 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -71480,30 +71480,51 @@ futures efficiently") operations.") (license (list license:expat license:asl2.0)))) -(define-public rust-tokio-macros-1 +(define-public rust-tokio-macros-2 (package (name "rust-tokio-macros") - (version "1.7.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (crate-uri "tokio-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1ds34qsfvgf63cjgdx3gr4pl7i76fifyar15ksbillcc8hpzfmxm")))) + (base32 "0pk7y9dfanab886iaqwcbri39jkw33kgl7y07v0kg1pp8prdq2v3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags '("--release" "--lib") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-1)))) (home-page "https://tokio.rs") (synopsis "Tokio's proc macros") (description "This package provides Tokio's proc macros.") (license license:expat))) +(define-public rust-tokio-macros-1 + (package + (inherit rust-tokio-macros-2) + (name "rust-tokio-macros") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ds34qsfvgf63cjgdx3gr4pl7i76fifyar15ksbillcc8hpzfmxm")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-tokio-macros-0.3 (package (inherit rust-tokio-macros-1) -- cgit v1.2.3 From 395227e20c76f9ed662720baf74176378e45c142 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:31:47 +0300 Subject: gnu: Add rust-asn1-0.15. * gnu/packages/crates-io.scm (rust-asn1-0.15): New variable. (rust-asn1-0.13): Inherit from rust-asn1-0.15. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fb0ca61e06..46bc526ce0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4228,8 +4228,32 @@ library for Rust.") "This package provides #[derive] support for @code{asn1}.") (license license:bsd-3))) +(define-public rust-asn1-0.15 + (package + (name "rust-asn1") + (version "0.15.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "asn1" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nzg1gjiyfvpvrf3i7i8j21165snf5livqg6x2sjf9m2i77cngmf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-asn1-derive" ,rust-asn1-derive-0.15)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/alex/rust-asn1") + (synopsis "ASN.1 (DER) parser and writer") + (description + "This is a Rust library for parsing and generating ASN.1 data (DER only).") + (license license:bsd-3))) + (define-public rust-asn1-0.13 (package + (inherit rust-asn1-0.15) (name "rust-asn1") (version "0.13.0") (source (origin @@ -4239,18 +4263,12 @@ library for Rust.") (sha256 (base32 "1idxxw14h3dvrj72k4g0hx1aqigd986a00cg0yxfw2gfc9gbmzra")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-asn1-derive" ,rust-asn1-derive-0.13) ("rust-chrono" ,rust-chrono-0.4)) #:cargo-development-inputs - (("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/alex/rust-asn1") - (synopsis "ASN.1 (DER) parser and writer") - (description - "This is a Rust library for parsing and generating ASN.1 data (DER only).") - (license license:bsd-3))) + (("rust-libc" ,rust-libc-0.2)))))) (define-public rust-asn1-rs-0.5 (package -- cgit v1.2.3 From 9d516ea192096001a904390ebc3359423867eb15 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:32:18 +0300 Subject: gnu: Add rust-asn1-derive-0.15. * gnu/packages/crates-io.scm (rust-asn1-derive-0.15): New variable. (rust-asn1-derive-0.13): Inherit from rust-asn1-derive-0.15. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 46bc526ce0..bc96214819 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4204,8 +4204,32 @@ Askama.") library for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-asn1-derive-0.15 + (package + (name "rust-asn1-derive") + (version "0.15.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "asn1-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1771kfjycjs4g2acqvxpjy3igfcgg8hychczl1lsqq64za4gj6l6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/alex/rust-asn1") + (synopsis "#[derive] support for asn1") + (description + "This package provides #[derive] support for @code{asn1}.") + (license license:bsd-3))) + (define-public rust-asn1-derive-0.13 (package + (inherit rust-asn1-derive-0.15) (name "rust-asn1-derive") (version "0.13.0") (source (origin @@ -4215,18 +4239,12 @@ library for Rust.") (sha256 (base32 "1bvqriazb23gysygpzng1dhzjgnlv274q2yj5gpmlpl7jp0pkaxz")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://github.com/alex/rust-asn1") - (synopsis "#[derive] support for asn1") - (description - "This package provides #[derive] support for @code{asn1}.") - (license license:bsd-3))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-asn1-0.15 (package -- cgit v1.2.3 From ad5e61ce9d2f0dc66288110f8df0498b7926b3b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:34:14 +0300 Subject: gnu: rust-openssl-0.10: Update to 0.10.57. * gnu/packages/crates-io.scm (rust-openssl-0.10): Update to 0.10.57. [source]: Add snippet to remove dependency on boringssl. --- gnu/packages/crates-io.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc96214819..c87c8b8222 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44611,18 +44611,22 @@ crate.") (define-public rust-openssl-0.10 (package (name "rust-openssl") - (version "0.10.52") + (version "0.10.57") (source (origin (method url-fetch) (uri (crate-uri "openssl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mldyz9w6d5bf3004m7kyjry7944m0pkkifzbywgg06z0935gf01")))) + "0z0f8g84y0lvnbc60586ibjpf8r1q1dv672vfqan5d5bk7imxhms")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + ((".*boringssl.*") "")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) + (("rust-bitflags" ,rust-bitflags-2) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-libc" ,rust-libc-0.2) -- cgit v1.2.3 From 7fcf7d94f20bf26df8126750cc7d43aa9194d9e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:34:30 +0300 Subject: gnu: rust-openssl-sys-0.9: Update to 0.9.93. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9): Update to 0.9.93. [source]: Remove patch. Add snippet to remove dependencies on boringssl and openssl source. * gnu/packages/patches/rust-openssl-src-no-vendor.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/crates-io.scm | 19 +++++++++---- .../patches/rust-openssl-sys-no-vendor.patch | 32 ---------------------- 3 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/rust-openssl-sys-no-vendor.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index bf7cfbf8bd..73f10b5e3c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1955,7 +1955,6 @@ dist_patch_DATA = \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ - %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c87c8b8222..583746fa5f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44725,22 +44725,29 @@ system for OpenSSL.") (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") - (version "0.9.87") + (version "0.9.93") (source (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0znc0q7a2gi2pmkscv0d6wzpfd64mgmy3w4lmrvrv05jcj9ga5wf")) - (patches (search-patches "rust-openssl-sys-no-vendor.patch")))) + (base32 "078vnn4s18kj8m5sd7b684frhjnxjcjc9z7s7h4871s7q2j5ckfv")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Remove dependency on boringssl and vendor openssl source. + (substitute* "Cargo.toml.orig" + (("vendored = .*") "vendored = []\n") + ((".*bssl.*") "") + ((".*openssl-src.*") "")) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ;; Build dependencies: - ("rust-bindgen" ,rust-bindgen-0.64) + (("rust-bindgen" ,rust-bindgen-0.64) ("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-vcpkg" ,rust-vcpkg-0.2)))) (native-inputs diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch deleted file mode 100644 index 5872d4cf22..0000000000 --- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400 -+++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400 -@@ -31,10 +31,6 @@ - [package.metadata.pkg-config] - openssl = "1.0.1" - --[dependencies.bssl-sys] --version = "0.1.0" --optional = true -- - [dependencies.libc] - version = "0.2" - -@@ -46,16 +42,12 @@ - [build-dependencies.cc] - version = "1.0" - --[build-dependencies.openssl-src] --version = "111" --optional = true -- - [build-dependencies.pkg-config] - version = "0.3.9" - - [features] --unstable_boringssl = ["bssl-sys"] --vendored = ["openssl-src"] -+unstable_boringssl = [] -+vendored = [] - - [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] - version = "0.2.8" -- cgit v1.2.3 From 227f4cacf6d93318dd322b675d41e311cee1f4f6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:36:02 +0300 Subject: gnu: python-cryptography-vectors: Update to 41.0.4. * gnu/packages/python-crypto.scm (python-cryptography-vectors): Update to 41.0.4. [build-system]: Switch to pyproject-build-system. [arguments]: Disable tests. --- gnu/packages/python-crypto.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 79c323663a..0a4155770b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -486,15 +486,16 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "40.0.2") + (version "41.0.4") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "16hcprw919f2rl3jipsy2996bnsz170inway3lishqi30xwqf6x8")))) - (build-system python-build-system) + "17m1azxfc3w0390jp9mkx1v0k3xfv4v1lrgch4hvbbm77s0z42j4")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ; No tests included. (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") (description -- cgit v1.2.3 From 424e0ea4e5f093f20af322e8e54a86f984881591 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:36:47 +0300 Subject: gnu: python-cryptography: Update to 41.0.4. * gnu/packages/python-crypto.scm (python-cryptography): Update to 41.0.4. (python-cryptography-rust)[arguments]: Don't install source. [cargo-inputs]: Add rust-foreign-types-0.3 Replace rust-asn1-0.13 with 0.15, rust-pyo3-0.15 with 0.18. Remove rust-chrono-0.4. --- gnu/packages/python-crypto.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0a4155770b..e28d1de837 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -506,14 +506,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "40.0.2") + (version "41.0.4") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "16awbsm13vdksm98dybwvmpy2y1l636bq7g0s93scksrp0r0sg63")))) + "06pm952pr6f31pzwh5fb68zryqyss0hg9cbggxm15z15844w7svz")))) (build-system pyproject-build-system) (arguments (list @@ -568,6 +568,7 @@ ciphers, message digests and key derivation functions.") (guix build utils) (srfi srfi-1) (ice-9 match)) + #:install-source? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir @@ -595,16 +596,16 @@ ciphers, message digests and key derivation functions.") (install-file "target/release/libcryptography_rust.so" (string-append #$output "/lib"))))) #:cargo-inputs - `(("rust-asn1-0.13" ,rust-asn1-0.13) + `(("rust-asn1" ,rust-asn1-0.15) ("rust-cc" ,rust-cc-1) - ("rust-chrono-0.4" ,rust-chrono-0.4) - ("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1) - ("rust-once-cell-1" ,rust-once-cell-1) - ("rust-openssl-0.10" ,rust-openssl-0.10) - ("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9) - ("rust-ouroboros-0.15" ,rust-ouroboros-0.15) - ("rust-pem-1" ,rust-pem-1) - ("rust-pyo3-0.15" ,rust-pyo3-0.15)))) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-ouroboros" ,rust-ouroboros-0.15) + ("rust-pem" ,rust-pem-1) + ("rust-pyo3" ,rust-pyo3-0.18)))) (native-inputs (list pkg-config python python-cffi)) ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs ;; doesn't honor propagated-inputs. -- cgit v1.2.3 From 8f60a52bb091b07e8836c33ee0dbad1f13db046b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Oct 2023 10:42:30 +0300 Subject: gnu: python-cryptography-rust: Use cargo-test-flags. * gnu/packages/python-crypto.scm (python-cryptography-rust) [arguments]: Replace custom 'check phase with cargo-test-flags. --- gnu/packages/python-crypto.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index e28d1de837..466cfa35db 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -569,6 +569,8 @@ ciphers, message digests and key derivation functions.") (srfi srfi-1) (ice-9 match)) #:install-source? #f + ;; As seen in noxfile.py + #:cargo-test-flags ''("--release" "--no-default-features") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir @@ -586,11 +588,6 @@ ciphers, message digests and key derivation functions.") (apply (assoc-ref %standard-phases 'configure) (append args (list #:inputs (alist-delete "source" inputs)))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; As seen in tox.ini - (invoke "cargo" "test" "--no-default-features")))) (add-after 'install 'install-shared-library (lambda _ (install-file "target/release/libcryptography_rust.so" -- cgit v1.2.3 From fa150d100750575d19c1a872f9c70a72d068fa73 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:46:54 +0300 Subject: gnu: Add rust-abi-stable-0.10. * gnu/packages/crates-io.scm (rust-abi-stable-0.10, rust-abi-stable-derive-0.10, rust-abi-stable-shared-0.10): New variables. --- gnu/packages/crates-io.scm | 103 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 583746fa5f..9ea1affee2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -153,6 +153,109 @@ rasterizing OpenType font glyphs.") cubic beziers.") (license license:asl2.0))) +(define-public rust-abi-stable-0.10 + (package + (name "rust-abi-stable") + (version "0.10.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi-stable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03vg0cl0727whv7nxyvm8g9xfwxnfcdn8p872jqw1z6n84yjix7s")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)," + " <([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)") + _ version _) + (string-append ">=" version))))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "testing" feature + #:cargo-inputs + (("rust-abi-stable-derive" ,rust-abi-stable-derive-0.10) + ("rust-abi-stable-shared" ,rust-abi-stable-shared-0.10) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-generational-arena" ,rust-generational-arena-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-lock-api" ,rust-lock-api-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-paste" ,rust-paste-1) + ("rust-repr-offset" ,rust-repr-offset-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-fnv" ,rust-fnv-1) + ("rust-hashbrown" ,rust-hashbrown-0.11) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Rust-to-Rust ffi,writing libraries loaded at program startup") + (description + "This package contains code for doing Rust-to-Rust ffi,writing libraries +loaded at program startup.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-abi-stable-derive-0.10 + (package + (name "rust-abi-stable-derive") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi-stable-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1w503n9rxja3h8ls6p5xsly8aclbp30dm4hd0525bvpbippi161v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=sabi_trait::tests::sabi_trait_test_cases" + "--skip=stable_abi::tests::test_cases") + #:cargo-inputs + (("rust-abi-stable-shared" ,rust-abi-stable-shared-0.10) + ("rust-as-derive-utils" ,rust-as-derive-utils-0.10) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-syn" ,rust-syn-1) + ("rust-typed-arena" ,rust-typed-arena-2)) + #:cargo-development-inputs + (("rust-as-derive-utils" ,rust-as-derive-utils-0.10)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Implementation detail of abi_stable.") + (description "This package contains an implementation detail of abi_stable.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-abi-stable-shared-0.10 + (package + (name "rust-abi-stable-shared") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi-stable-shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0psaz0vghdz84vrb311g4b74d2nhrlbmwxa8if88s0bf0s4xmsgc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-core-extensions" ,rust-core-extensions-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Implementation detail of abi_stable") + (description "This package contains an implementation detail of abi_stable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-abomonation-0.7 (package (name "rust-abomonation") -- cgit v1.2.3 From cdb9872658d9dc71d88088218450174597258fe9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:47:59 +0300 Subject: gnu: Add rust-mimalloc-rust-0.1. * gnu/packages/crates-io.scm (rust-mimalloc-rust-0.1, rust-mimalloc-rust-sys-0.1): New variables. --- gnu/packages/crates-io.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9ea1affee2..f31bdbbbb8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -39342,6 +39343,74 @@ embedded migrations.") drop-in allocator.") (license license:expat))) +(define-public rust-mimalloc-rust-0.1 + (package + (name "rust-mimalloc-rust") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "mimalloc-rust" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wj4hkspsmlgm6lh5bf2blzalgjcc356bpkh4k5vcnyvvzwhvhxw")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("1\\.7\\.3-source") "1.7.2")))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Test suite is flakey. + #:cargo-inputs + (("rust-cty" ,rust-cty-0.2) + ("rust-mimalloc-rust-sys" ,rust-mimalloc-rust-sys-1)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) + (inputs + (list mimalloc)) + (home-page "https://github.com/lemonhx/mimalloc-rust") + (synopsis "Binding for mimalloc in rust") + (description "This package provides a binding for mimalloc in rust.") + (license license:expat))) + +(define-public rust-mimalloc-rust-sys-1 + (package + (name "rust-mimalloc-rust-sys") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "mimalloc-rust-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "144m1va3dmbr6c5nj1aqnnfrp0fc4yyqn10n25w7ksvsrhnz7xwn")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "c_src") + ;; Inspired by Debian's patch for bzip2-sys. + (substitute* "Cargo.toml.orig" + (("cc = .*") "pkg-config = \"0.3\"\n")) + (copy-file "Cargo.toml.orig" "Cargo.toml") + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=mimalloc\");~@ + }~%"))))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cty" ,rust-cty-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs + (list mimalloc)) + (home-page "https://docs.rs/mimalloc-rust-sys/1.7.2") + (synopsis "@code{mimalloc_rust} hand written sys binding") + (description + "This package provides @code{mimalloc_rust} hand written sys bindings.") + (license license:expat))) + (define-public rust-mime-0.3 (package (name "rust-mime") -- cgit v1.2.3 From ee47d5b342c037ce385fe718503ead6e237bc594 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:48:34 +0300 Subject: gnu: rust-ahash-0.7: Update to 0.7.6. * gnu/packages/crates-io.scm (rust-ahash-0.7): Update to 0.7.6. [arguments]: Don't skip build. [cargo-development-inputs]: Add rust-criterion-0.3, rust-fnv-1, rust-fxhash-0.2, rust-hex-0.4, rust-no-panic-0.1, rust-seahash-4, rust-serde-json-1. --- gnu/packages/crates-io.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f31bdbbbb8..71ee6cdbc2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2553,24 +2553,31 @@ high performance.") (define-public rust-ahash-0.7 (package (name "rust-ahash") - (version "0.7.4") + (version "0.7.6") (source (origin (method url-fetch) (uri (crate-uri "ahash" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "163vy6jcd7r3jczsv4zyhlc5x9dqsfgg1yrqbm3xhygr1czq7fs3")))) + (base32 "0isw672fiwx8cjl040jrck6pi85xcszkz6q0xsqkiy6qjl31mdgw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-const-random" ,rust-const-random-0.1) ("rust-getrandom" ,rust-getrandom-0.2) ("rust-once-cell" ,rust-once-cell-1) ("rust-serde" ,rust-serde-1) - ("rust-version-check" ,rust-version-check-0.9)))) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-fnv" ,rust-fnv-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-hex" ,rust-hex-0.4) + ("rust-no-panic" ,rust-no-panic-0.1) + ("rust-rand" ,rust-rand-0.7) + ("rust-seahash" ,rust-seahash-4) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/tkaitchuck/ahash") (synopsis "Non-cryptographic hash function using AES-NI") (description "This package provides a non-cryptographic hash function -- cgit v1.2.3 From c7d22b9eb5b8f8cb4e7f0950acd8af7a352204ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:49:50 +0300 Subject: gnu: Add rust-as-derive-utils-0.10. * gnu/packages/crates-io.scm (rust-as-derive-utils-0.10): New variable. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 71ee6cdbc2..a0638d4ee4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4209,6 +4209,44 @@ the web.") ;; No copyright headers in the source code. LICENSE indicates gpl3. (license license:gpl3))) +(define-public rust-as-derive-utils-0.10 + (package + (name "rust-as-derive-utils") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "as-derive-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16qxh5q7gn6vnzk20g7vaj76f4dd74zkn66fv638ryyfjnj6z8p0")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)," + " <([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)") + _ version _) + (string-append ">=" version))))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Only doc tests, which fail. + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-ron" ,rust-ron-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Private derive utilities used by abi_stable and structural") + (description "This package contains private derive utilities used by +the abi_stable and structural crates.") + (license (list license:expat license:asl2.0)))) + (define-public rust-askama-escape-0.10 (package (name "rust-askama-escape") -- cgit v1.2.3 From 1958021713152c30cfa3b573d605fef7327be8d2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:50:26 +0300 Subject: gnu: Add rust-auto-impl-0.5. * gnu/packages/crates-io.scm (rust-auto-impl-0.5): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a0638d4ee4..3bd5b386ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5967,6 +5967,36 @@ they're not available.") ("rust-termion" ,rust-termion-1) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-auto-impl-0.5 + (package + (name "rust-auto-impl") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "auto-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "195d6s9bfcchwizf3km1g69l74f6xvm5gl9505js2r9xi4ff4qkq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=ui_compile_fail") + #:cargo-inputs + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/auto-impl-rs/auto_impl/") + (synopsis + "Automatically implement traits for common smart pointers and closures") + (description + "Automatically implement traits for common smart pointers and closures.") + (license (list license:expat license:asl2.0)))) + (define-public rust-autocompress-0.2 (package (name "rust-autocompress") -- cgit v1.2.3 From f362a832985e8823b7474a96352f7ad6937977ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:50:52 +0300 Subject: gnu: Add rust-convert-case-0.6. * gnu/packages/crates-io.scm (rust-convert-case-0.6): New variable. (rust-convert-case-0.4): Inherit from rust-convert-case-0.6. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3bd5b386ab..59e113054e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14812,27 +14812,57 @@ to guess the type of content.") semantics than those provided by @code{as} or @code{From}/@code{Into}.") (license license:expat))) -(define-public rust-convert-case-0.4 +(define-public rust-convert-case-0.6 (package (name "rust-convert-case") - (version "0.4.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "convert-case" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03jaf1wrsyqzcaah9jf8l1iznvdw5mlsca2qghhzr9w27sddaib2")))) + (base32 "1jn1pq6fp3rri88zyw6jlhwwgf6qiyc08d6gjv0qypgkl862n67c")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + (list "--release" "--" + "--skip=case::Case::PseudoRandom" + "--skip=case::Case::Random" + "--skip=pattern::Pattern::PseudoRandom") #:cargo-inputs - (("rust-rand" ,rust-rand-0.7)))) + (("rust-rand" ,rust-rand-0.7) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)) + #:cargo-development-inputs + (("rust-strum" ,rust-strum-0.18) + ("rust-strum-macros" ,rust-strum-macros-0.18)))) (home-page "https://github.com/rutrum/convert-case") (synopsis "Convert strings into any case") (description "Convert strings into any case.") (license license:expat))) +(define-public rust-convert-case-0.4 + (package + (inherit rust-convert-case-0.6) + (name "rust-convert-case") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "convert-case" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03jaf1wrsyqzcaah9jf8l1iznvdw5mlsca2qghhzr9w27sddaib2")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand" ,rust-rand-0.7)))))) + (define-public rust-cookie-0.17 (package (name "rust-cookie") -- cgit v1.2.3 From 438f479fc6a5763d27fc818be90eb28b77b4bfd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:51:36 +0300 Subject: gnu: Add rust-core-extensions-1. * gnu/packages/crates-io.scm (rust-core-extensions-1, rust-core-extensions-proc-macros-1): New variables. --- gnu/packages/crates-io.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 59e113054e..bfb4b633a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15129,6 +15129,57 @@ contents of the OS-level clipboard.") numbers using the CORDIC method.") (license license:bsd-3))) +(define-public rust-core-extensions-1 + (package + (name "rust-core-extensions") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-extensions" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vn0jsn8nbi76i2jjadim31piscf0hv8640ng9z608cpgk01viwj")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "__test" feature + #:cargo-inputs + (("rust-core-extensions-proc-macros" ,rust-core-extensions-proc-macros-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4) + ("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/rodrimati1992/core_extensions") + (synopsis + "Extensions for core/std library types, and other miscelaneous features") + (description + "Extensions for core/std library types, and other miscelaneous features.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-core-extensions-proc-macros-1 + (package + (name "rust-core-extensions-proc-macros") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-extensions-proc-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19k11haw8s00zxxignjmw0ian0q85r9grhbvr153nvlbs8cv5wv9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1)))) + (home-page "https://github.com/rodrimati1992/core_extensions") + (synopsis "Implementation detail of the @code{core_extensions} crate") + (description "Implementation detail of the @code{core_extensions} crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core2-0.3 (package (name "rust-core2") -- cgit v1.2.3 From 90dc9b4f94adcbdb0ddcc79e4fb9554d5ec90bce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:52:40 +0300 Subject: gnu: rust-is-macro-0.1: Update to 0.1.9. * gnu/packages/crates-io.scm (rust-is-macro-0.1): Update to 0.1.9. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bfb4b633a7..486e2ac96e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33526,15 +33526,14 @@ or not without much fuss.") (define-public rust-is-macro-0.1 (package (name "rust-is-macro") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (crate-uri "is-macro" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1vjh4sdpvx1kdf1znyk3b54gkyk7f8lsasc47ypkksp3r4ypz004")))) + (base32 "0pq1x1r8pk6fv0qf9vpxw60jw2jg3961nm1gv71j5qv0v4bds8m3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 61862daa52276f13085fe1291dbddf5a81dd30b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:53:12 +0300 Subject: gnu: rust-lexical-core-0.7: Fix inputs. * gnu/packages/crates-io.scm (rust-lexical-core-0.7) [cargo-development-inputs]: Move rust-proptest-0.10, rust-quickcheck-1 to ... [cargo-inputs]: ... to here. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 486e2ac96e..bdec111e3f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35333,12 +35333,12 @@ sending emails from Rust applications.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-dtoa" ,rust-dtoa-0.4) ("rust-libm" ,rust-libm-0.2) + ("rust-proptest" ,rust-proptest-0.10) + ("rust-quickcheck" ,rust-quickcheck-1) ("rust-ryu" ,rust-ryu-1) ("rust-static-assertions" ,rust-static-assertions-1)) #:cargo-development-inputs - (("rust-approx" ,rust-approx-0.4) - ("rust-proptest" ,rust-proptest-0.10) - ("rust-quickcheck" ,rust-quickcheck-1)))))) + (("rust-approx" ,rust-approx-0.4)))))) (define-public rust-lexical-parse-float-0.8 (package -- cgit v1.2.3 From 53f5f8b49e190f81cd2a1abf835efdee443f2b3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:54:38 +0300 Subject: gnu: rust-proptest-1: Update to 1.3.1. * gnu/packages/crates-io.scm (rust-proptest-1): Update to 1.3.1. [cargo-inputs]: Add rust-bit-vec-0.6. Replace rust-bitflags-1 with 2, rust-regex-syntax-0.6 with 0.7. Remove rust-byteorder-1, rust-quick-error-2. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bdec111e3f..29cdd7bd68 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50931,27 +50931,26 @@ property-based testing and fuzzing.") (define-public rust-proptest-1 (package (name "rust-proptest") - (version "1.1.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (crate-uri "proptest" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0w5s3wwchd3i6m15lsbsk3r3y25d1gwn13m6a185ks8w06cbiw99")))) + (base32 "03n213yppl8lpw94cms2bb6rns3ahg78n6az9yvppc3wqz43l03w")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5) - ("rust-bitflags" ,rust-bitflags-1) - ("rust-byteorder" ,rust-byteorder-1) + ("rust-bit-vec" ,rust-bit-vec-0.6) + ("rust-bitflags" ,rust-bitflags-2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-quick-error" ,rust-quick-error-2) ("rust-rand" ,rust-rand-0.8) ("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) - ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-regex-syntax" ,rust-regex-syntax-0.7) ("rust-rusty-fork" ,rust-rusty-fork-0.3) ("rust-tempfile" ,rust-tempfile-3) ("rust-unarray" ,rust-unarray-0.1) -- cgit v1.2.3 From 533779c2354712270f69b5628074e607043effaa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:55:58 +0300 Subject: gnu: Add rust-repr-offset-0.2. * gnu/packages/crates-io.scm (rust-repr-offset-0.2, rust-repr-offset-derive-0.2): New variables. --- gnu/packages/crates-io.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 29cdd7bd68..d0a0ee4072 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -55222,6 +55222,57 @@ Rust.") (description "File reopening utility.") (license (list license:asl2.0 license:expat)))) +(define-public rust-repr-offset-0.2 + (package + (name "rust-repr-offset") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "repr-offset" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1skj3cy77j7vwslnjjzgladq61z6jjvwlw89kp0zz7fjbdsp047v")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "testing" feature + #:cargo-inputs + (("rust-repr-offset-derive" ,rust-repr-offset-derive-0.2) + ("rust-tstr" ,rust-tstr-0.2)) + #:cargo-development-inputs + (("rust-repr-offset-derive" ,rust-repr-offset-derive-0.2)))) + (home-page "https://github.com/rodrimati1992/repr_offset_crates/") + (synopsis "Offsets of fields for types with a stable layout") + (description "Offsets of fields for types with a stable layout.") + (license license:zlib))) + +(define-public rust-repr-offset-derive-0.2 + (package + (name "rust-repr-offset-derive") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "repr-offset-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rwkbf12vmgi5v1llmgiirn0yaaiyw821rd7fc9fhpbkdxz95yh9")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "testing" feature + #:cargo-inputs + (("rust-as-derive-utils" ,rust-as-derive-utils-0.8) + ("rust-core-extensions" ,rust-core-extensions-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/repr_offset_crates/") + (synopsis + "For deriving the offsets of fields for types with a stable layout") + (description + "For deriving the offsets of fields for types with a stable layout.") + (license license:zlib))) + (define-public rust-reqwest-0.11 (package (name "rust-reqwest") -- cgit v1.2.3 From 073e20ef20108b7fa0e76b4855866a87f5ba8134 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:56:27 +0300 Subject: gnu: rust-retain-mut-0.1: Update to 0.1.9. * gnu/packages/crates-io.scm (rust-retain-mut-0.1): Update to 0.1.9. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d0a0ee4072..eaf75a13b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -55497,15 +55497,14 @@ Rust.") (define-public rust-retain-mut-0.1 (package (name "rust-retain-mut") - (version "0.1.1") + (version "0.1.9") (source (origin (method url-fetch) (uri (crate-uri "retain_mut" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0cgmm1q7sr31r9wk7syh53ipgqpl37jzsvahdhmwrsi6mmcdc1g0")))) + (base32 "1c0jfxzba0mcw8q4z7dnc4ypwzxgqkdggngb55hazvwvg3az32a3")))) (build-system cargo-build-system) (home-page "https://github.com/upsuper/retain_mut") (synopsis "Mutable borrow for the retain predicate") -- cgit v1.2.3 From d176d82d9e889cddd9bbedd52b6400b845784741 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:56:56 +0300 Subject: gnu: rust-sourcemap-6: Update to 6.4.1. * gnu/packages/crates-io.scm (rust-sourcemap-6): Update to 6.4.1. [source]: Remove snippet. [arguments]: Add cargo-test-flags. Remove custom phases. [cargo-inputs]: Add rust-data-encoding-2, rust-debugid-0.8, rust-rustc-version-0.2, rust-unicode-id-0.3. Remove rust-lazy-static-1, rust-regex-1. [cargo-development-inputs]: Add rust-magic-string-0.3, rust-proptest-1. --- gnu/packages/crates-io.scm | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eaf75a13b9..9f1918f86a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64953,42 +64953,32 @@ maximal amount of configuration possible intended.") (define-public rust-sourcemap-6 (package (name "rust-sourcemap") - (version "6.0.1") + (version "6.4.1") (source (origin (method url-fetch) (uri (crate-uri "sourcemap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1sv1rxc6d2rfvd5xrqzqq0i2y0z1q7sqj3wm9krxbggcccj1y0vf")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Enable unstable features - (substitute* "src/lib.rs" - (("//! This library" all) - (string-append "#![feature(inner_deref)]" "\n" all))) - #t)))) + (base32 "145xyp6qaai2gd5p92bkg7yzrm4n5mqx1y111vsnqmywlxfgdjz4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-base64" ,rust-base64-0.11) + `(#:cargo-test-flags + (list "--release" "--" + "--skip=types::tests::test_adjust_mappings_injection") + #:cargo-inputs + (("rust-data-encoding" ,rust-data-encoding-2) + ("rust-debugid" ,rust-debugid-0.8) ("rust-if-chain" ,rust-if-chain-1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-regex" ,rust-regex-1) + ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-scroll" ,rust-scroll-0.10) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-unicode-id" ,rust-unicode-id-0.3) ("rust-url" ,rust-url-2)) #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - #t))))) + (("rust-magic-string" ,rust-magic-string-0.3) + ("rust-proptest" ,rust-proptest-1)))) (home-page "https://github.com/getsentry/rust-sourcemap") (synopsis "Basic sourcemap handling for Rust") (description "This package provides basic sourcemap handling for Rust.") -- cgit v1.2.3 From 740b9f1608a0675ce3d708d92cbc558923f26496 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 09:59:18 +0300 Subject: gnu: rust-test-case-1: Update to 1.2.3. * gnu/packages/crates-io.scm (rust-test-case-1): Update to 1.2.3. [arguments]: Don't skip tests. Add cargo-test-flags. [cargo-development-inputs]: Add rust-indexmap-1.7, rust-itertools-0.10. Replace rust-insta-0.12 with 0.16. --- gnu/packages/crates-io.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f1918f86a..b2695d869f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -69958,23 +69958,32 @@ into mod, giving clear and readable test results.") (package (inherit rust-test-case-2) (name "rust-test-case") - (version "1.0.0") + (version "1.2.3") (source (origin (method url-fetch) (uri (crate-uri "test-case" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1j33njgyr4cjhil14va909sg8s6ahzpgcmiaigdg7g22ica6950r")))) + (base32 "0siwpm8g40g5gcvwcn6g4iq0bdhm6lb3dq6wcspfhhsb814g1rg9")))) (arguments - `(#:tests? #false ;XXX: a single test fails, cannot skip it + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=acceptance::async_tests" + "--skip=acceptance::hamcrest_assertions" + "--skip=acceptance::basic" + "--skip=acceptance::allow_result_check" + "--skip=acceptance::return_check") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1) ("rust-version-check" ,rust-version-check-0.9)) #:cargo-development-inputs - (("rust-insta" ,rust-insta-0.12) + (("rust-indexmap" ,rust-indexmap-1.7) + ("rust-insta" ,rust-insta-0.16) + ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1)))))) (define-public rust-test-case-core-3 -- cgit v1.2.3 From 76e8f40de571c9d528c6434984eea8eec05c38f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:00:34 +0300 Subject: gnu: Add rust-tstr-0.2. * gnu/packages/crates-io.scm (rust-tstr-0.2, rust-tstr-proc-macros-0.2): New variables. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b2695d869f..a86aef45f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -75307,6 +75307,51 @@ and run them to verify the results, taking inspiration from @code{trybuild} and ("rust-snapbox" ,rust-snapbox-0.4) ("rust-toml-edit" ,rust-toml-edit-0.14)))))) +(define-public rust-tstr-0.2 + (package + (name "rust-tstr") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "tstr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zidpsrn9b4i55cz832myxi2gw3qq6imbd7kxq7yq389f54jd8yc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=macros::ts" + "--skip=macros::alias") + #:cargo-inputs + (("rust-tstr-proc-macros" ,rust-tstr-proc-macros-0.2)))) + (home-page "https://github.com/rodrimati1992/tstr_crates/") + (synopsis "Type-level strings") + (description "Type-level strings") + (license license:zlib))) + +(define-public rust-tstr-proc-macros-0.2 + (package + (name "rust-tstr-proc-macros") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tstr-proc-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yklq0k0s3c4y0k5f0qm13lw7nvz5z97x3yhmyw1if0cdc3250g7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/tstr_crates/") + (synopsis "Implementation detail of tstr") + (description "Implementation detail of tstr.") + (license license:zlib))) + (define-public rust-ttf-parser-0.19 (package (name "rust-ttf-parser") -- cgit v1.2.3 From e9b2122e571e1d18f593159524f63c1f1a8293a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:01:25 +0300 Subject: gnu: rust-unicode-segmentation-1: Update to 1.10.1. * gnu/packages/crates-io.scm (rust-unicode-segmentation-1): Update to 1.10.1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a86aef45f2..527a5e0274 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76456,15 +76456,14 @@ described in Unicode Standard Annex #15.") (define-public rust-unicode-segmentation-1 (package (name "rust-unicode-segmentation") - (version "1.8.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (crate-uri "unicode-segmentation" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nrqfgxkh00wb5dhl0874z20789i2yjimp6ndgh4ay4yjjd895c8")))) + (base32 "0dky2hm5k51xy11hc3nk85p533rvghd462b6i0c532b7hl4j9mhx")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From 66ab2e82897b1c2de1cc38f1ce66b708119b9ee6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:05:11 +0300 Subject: gnu: Add rust-napi-sys-2. * gnu/packages/crates-io.scm (rust-napi-sys-2): New variable. (rust-napi-sys-0.4): Inherit from rust-napi-sys-2. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 527a5e0274..4b058242a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41058,8 +41058,28 @@ linear algebra library.") (description "This package provides N-API procedural macros.") (license license:expat))) +(define-public rust-napi-sys-2 + (package + (name "rust-napi-sys") + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qxs0wxlax3nj3b1q1vgr5ihzp8c0d58vzm98x85gd9s5bsmwsqn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libloading" ,rust-libloading-0.7)))) + (home-page "https://github.com/napi-rs/napi-rs") + (synopsis "NodeJS N-API raw binding") + (description "This package provides a NodeJS N-API raw binding.") + (license license:expat))) + (define-public rust-napi-sys-0.4 (package + (inherit rust-napi-sys-2) (name "rust-napi-sys") (version "0.4.7") (source @@ -41070,7 +41090,6 @@ linear algebra library.") (sha256 (base32 "0cjirf6n4i2lw65iaww8d4hahv3cbfm5ka9hlansvnbfgzwadzq9")))) - (build-system cargo-build-system) (inputs (list openssl)) (native-inputs @@ -41084,11 +41103,7 @@ linear algebra library.") (("rust-flate2" ,rust-flate2-1) ("rust-glob" ,rust-glob-0.3) ("rust-regex" ,rust-regex-1) - ("rust-reqwest" ,rust-reqwest-0.10)))) - (home-page "https://github.com/napi-rs/napi-rs") - (synopsis "NodeJS N-API raw binding") - (description "This package provides a NodeJS N-API raw binding.") - (license license:expat))) + ("rust-reqwest" ,rust-reqwest-0.10)))))) (define-public rust-native-tls-0.2 (package -- cgit v1.2.3 From 47367336b782b394c0d9fae6b4363d4f7f9f3eb6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:05:48 +0300 Subject: gnu: Add rust-napi-derive-backend-1. * gnu/packages/crates-io.scm (rust-napi-derive-backend-1): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4b058242a9..8790faa963 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41058,6 +41058,32 @@ linear algebra library.") (description "This package provides N-API procedural macros.") (license license:expat))) +(define-public rust-napi-derive-backend-1 + (package + (name "rust-napi-derive-backend") + (version "1.0.52") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-derive-backend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05wy00faa3bz2lqcrwnlr3l9hzwrw3qcapljiy26ml38j73cgfr0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-convert-case" ,rust-convert-case-0.6) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-semver" ,rust-semver-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://napi.rs") + (synopsis "Codegen backend for napi procedural macro") + (description "Codegen backend for napi procedural macro.") + (license license:expat))) + (define-public rust-napi-sys-2 (package (name "rust-napi-sys") -- cgit v1.2.3 From 3e3ac624b59fe31b2bda58a5bd80497d188a5889 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:07:34 +0300 Subject: gnu: Add rust-napi-derive-2. * gnu/packages/crates-io.scm (rust-napi-derive-2): New variable. (rust-napi-derive-0.5): Inherit from rust-napi-derive-2. --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8790faa963..e30b9ea3bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41035,22 +41035,24 @@ linear algebra library.") (description "This package provides N-API build support.") (license license:expat))) -(define-public rust-napi-derive-0.5 +(define-public rust-napi-derive-2 (package (name "rust-napi-derive") - (version "0.5.1") + (version "2.13.0") (source (origin (method url-fetch) (uri (crate-uri "napi-derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0kkgpzw4i6f0zkg80v9vhr7y5rg25q3kv67029i1gcgsrxlqx4zi")))) + (base32 "0rz3plhps1i1p5m02ffy97lcd3mzf8ihdkcgf2l9lm2dm27nl76s")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-convert-case" ,rust-convert-case-0.6) + ("rust-napi-derive-backend" ,rust-napi-derive-backend-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/napi-rs/napi-rs") @@ -41058,6 +41060,25 @@ linear algebra library.") (description "This package provides N-API procedural macros.") (license license:expat))) +(define-public rust-napi-derive-0.5 + (package + (inherit rust-napi-derive-2) + (name "rust-napi-derive") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kkgpzw4i6f0zkg80v9vhr7y5rg25q3kv67029i1gcgsrxlqx4zi")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-napi-derive-backend-1 (package (name "rust-napi-derive-backend") -- cgit v1.2.3 From d92d33004d35430683e03742d6261d76dcc674af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:09:09 +0300 Subject: gnu: Add rust-napi-build-1. * gnu/packages/crates-io.scm (rust-napi-build-1): New variable. (rust-napi-build-0.2): Inherit from rust-napi-build-1. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e30b9ea3bf..5a5674052f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41013,28 +41013,47 @@ linear algebra library.") (description "This package provides N-API bindings.") (license license:expat))) -(define-public rust-napi-build-0.2 +(define-public rust-napi-build-1 (package (name "rust-napi-build") - (version "0.2.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (crate-uri "napi-build" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1z02mlw1wa01fjpjnqns3f3vxacbg1jnk98hcg3pgwp5xy3zdyqq")))) + (base32 "0asjspv0gkg6lgdz3d6gl9ab7hbc9z2hc51m637j6x3jfa8l3m7b")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "src/libs") + ;; Don't try to read the removed files. + (substitute* "src/windows.rs" + (("include_bytes.*") + "unreachable!(),\n")))))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-reqwest" ,rust-reqwest-0.10)))) (home-page "https://github.com/napi-rs/napi-rs") (synopsis "N-API build support") (description "This package provides N-API build support.") (license license:expat))) +(define-public rust-napi-build-0.2 + (package + (inherit rust-napi-build-1) + (name "rust-napi-build") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-build" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z02mlw1wa01fjpjnqns3f3vxacbg1jnk98hcg3pgwp5xy3zdyqq")))) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-reqwest" ,rust-reqwest-0.10)))))) + (define-public rust-napi-derive-2 (package (name "rust-napi-derive") -- cgit v1.2.3 From b587d0bf368e7b19370210e5a9e25dfa4f41bd00 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:10:03 +0300 Subject: gnu: Add rust-napi-2. * gnu/packages/crates-io.scm (rust-napi-2): New variable. (rust-napi-0.5): Inherit from rust-napi-2. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5a5674052f..b32b77dacf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40984,8 +40984,39 @@ linear algebra library.") #:cargo-development-inputs (("rust-nalgebra" ,rust-nalgebra-0.26)))))) +(define-public rust-napi-2 + (package + (name "rust-napi") + (version "2.13.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h1sbblg638h1pnhvf2yxy0lzk8hy9dwx5mswc296500p69kq1px")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-napi-derive" ,rust-napi-derive-2) + ("rust-napi-sys" ,rust-napi-sys-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/napi-rs/napi-rs") + (synopsis "N-API bindings") + (description "This package provides N-API bindings.") + (license license:expat))) + (define-public rust-napi-0.5 (package + (inherit rust-napi-2) (name "rust-napi") (version "0.5.1") (source @@ -40996,7 +41027,6 @@ linear algebra library.") (sha256 (base32 "0mp0di7zv1r9gn3r3pmqnyy6q94akd9d6bl1p7m76nm9hgj9rw56")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8) @@ -41007,11 +41037,7 @@ linear algebra library.") ("rust-serde-json" ,rust-serde-json-1) ("rust-tokio" ,rust-tokio-0.2)) #:cargo-development-inputs - (("rust-napi-build" ,rust-napi-build-0.2)))) - (home-page "https://github.com/napi-rs/napi-rs") - (synopsis "N-API bindings") - (description "This package provides N-API bindings.") - (license license:expat))) + (("rust-napi-build" ,rust-napi-build-0.2)))))) (define-public rust-napi-build-1 (package -- cgit v1.2.3 From cf300075a5c4a855c1d0461ac8da54dcb3d0642e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:11:10 +0300 Subject: gnu: rust-swc: Update to 1.2.124. * gnu/packages/rust-apps.scm (rust-swc): Update to 1.2.124. [source]: Add snippet to not hardcode dependency versions. [arguments]: Don't install package source. Don't skip tests. Add cargo-build-flags and cargo-test-flags to only build the swc_cli binary. Remove custom 'enable-unstable-phases, 'patch-build-failures phases. Use custom 'install phase. [cargo-inputs]: Add rust-abi-stable-0.10, rust-ahash-0.7, rust-ansi-term-0.12, rust-anyhow-1, rust-arrayvec-0.5, rust-arbitrary-1, rust-auto-impl-0.5, rust-auto-impl-0.4, rust-backtrace-0.3, rust-bincode-1, rust-bitflags-1, rust-browserslist-0.6, rust-cfg-if-0.1, rust-copyless-0.1, rust-debug-unreachable-0.1, rust-difference-2, rust-glob-0.3, rust-hex-0.4, rust-indexmap-1, rust-inflector-0.11, rust-lexical-5, rust-libloading-0.7, rust-lru-0.7, rust-mimalloc-rust-0.1, rust-normpath-0.2, rust-num-bigint-0.2, rust-owning-ref-0.4, rust-parking-lot-0.11, rust-parking-lot-core-0.8, rust-paw-0.8, rust-pmutil-0.5, rust-pretty-assertions-0.7, rust-pretty-assertions-0.6, rust-quote-1, rust-rayon-1, rust-rustc-hash-1, rust-semver-0.9, rust-serde-1, rust-serde-json-1, rust-serde-regex-1, rust-sha-1-0.9, rust-smallvec-1, rust-sourcemap-6, rust-string-cache-codegen-0.5, rust-structopt-0.3, rust-syn-1, rust-termcolor-1, rust-tracing-0.1, rust-tracing-subscriber-0.3, rust-typed-arena-2, rust-wasm-bindgen-0.2, rust-wasm-bindgen-futures-0.4, rust-unicode-width-0.1, rust-unicode-xid-0.2, rust-url-2. Replace rust-dashmap-3 with 4, rust-napi-0.5 with 2, rust-napi-build-0.2 with 1, rust-napi-derive-0.5 with 2, rust-ordered-float-1 with 2. Remove rust-fxhash-0.2, rust-jemallocator-0.3, rust-log-0.4, rust-mimalloc-0.1. [cargo-development-inputs]: Add rust-ansi-term-0.12, rust-dashmap-4, rust-hex-0.4, rust-ntest-0.7, rust-path-clean-0.1, rust-pretty-assertions-0.7, rust-reqwest-0.11, rust-sha-1-0.9, rust-url-2, rust-walkdir-2. Remove rust-num-bigint-0.2, rust-pretty-env-logger-0.3, rust-string-cache-codegen-0.5, rust-tempfile-3. --- gnu/packages/rust-apps.scm | 136 ++++++++++++++++++++++++++++++--------------- 1 file changed, 90 insertions(+), 46 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index ee86907e95..f9c14dbdbd 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1084,7 +1084,7 @@ touchscreen devices.") (define-public rust-swc (package (name "rust-swc") - (version "1.2.24") + (version "1.2.124") (source (origin (method git-fetch) @@ -1094,81 +1094,125 @@ touchscreen devices.") (file-name (git-file-name name version)) (sha256 (base32 - "1w9al035x0gmard80vqvah8sy8szs6bnd1ynnyssiiylzg7vhyyv")))) + "1cb65vl437sy7shflsazi2k4sz53v3r85dj8rb32ny1j6njczj4h")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* (find-files "." "^Cargo\\.toml$") + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-base64" ,rust-base64-0.12) + `(#:install-source? #f + #:cargo-build-flags + '("--release" "-p" "swc_cli") + #:cargo-test-flags + '("--release" "-p" "swc_cli") + #:cargo-inputs + (("rust-abi-stable" ,rust-abi-stable-0.10) + ("rust-ahash" ,rust-ahash-0.7) + ("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-arbitrary" ,rust-arbitrary-1) + ("rust-auto-impl" ,rust-auto-impl-0.5) + ("rust-auto-impl" ,rust-auto-impl-0.4) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bincode" ,rust-bincode-1) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-browserslist-rs" ,rust-browserslist-rs-0.6) + ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-copyless" ,rust-copyless-0.1) ("rust-crc" ,rust-crc-1) ("rust-darling" ,rust-darling-0.10) - ("rust-dashmap" ,rust-dashmap-3) + ("rust-dashmap" ,rust-dashmap-4) + ("rust-debug-unreachable" ,rust-debug-unreachable-0.1) + ("rust-difference" ,rust-difference-2) ("rust-either" ,rust-either-1) - ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-glob" ,rust-glob-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-inflector" ,rust-inflector-0.11) ("rust-is-macro" ,rust-is-macro-0.1) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-log" ,rust-log-0.4) - ("rust-mimalloc" ,rust-mimalloc-0.1) - ("rust-napi" ,rust-napi-0.5) - ("rust-napi-build" ,rust-napi-build-0.2) - ("rust-napi-derive" ,rust-napi-derive-0.5) + ("rust-lexical" ,rust-lexical-5) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-lru" ,rust-lru-0.7) + ("rust-mimalloc-rust" ,rust-mimalloc-rust-0.1) + ("rust-napi" ,rust-napi-2) + ("rust-napi-build" ,rust-napi-build-1) + ("rust-napi-derive" ,rust-napi-derive-2) ("rust-nom" ,rust-nom-5) + ("rust-normpath" ,rust-normpath-0.2) + ("rust-num-bigint" ,rust-num-bigint-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-ordered-float" ,rust-ordered-float-1) + ("rust-ordered-float" ,rust-ordered-float-2) + ("rust-owning-ref" ,rust-owning-ref-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-parking-lot" ,rust-parking-lot-0.7) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.8) ("rust-path-clean" ,rust-path-clean-0.1) + ("rust-paw" ,rust-paw-1) ("rust-petgraph" ,rust-petgraph-0.5) ("rust-phf" ,rust-phf-0.8) + ("rust-pmutil" ,rust-pmutil-0.5) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rayon" ,rust-rayon-1) ("rust-radix-fmt" ,rust-radix-fmt-1) ("rust-regex" ,rust-regex-1) ("rust-relative-path" ,rust-relative-path-1) ("rust-retain-mut" ,rust-retain-mut-0.1) + ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-semver" ,rust-semver-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-regex" ,rust-serde-regex-1) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-sourcemap" ,rust-sourcemap-6) ("rust-st-map" ,rust-st-map-0.1) ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-syn" ,rust-syn-1) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-typed-arena" ,rust-typed-arena-2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-url" ,rust-url-2)) #:cargo-development-inputs - (("rust-anyhow" ,rust-anyhow-1) + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-dashmap" ,rust-dashmap-4) ("rust-env-logger" ,rust-env-logger-0.7) - ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-hex" ,rust-hex-0.4) + ("rust-ntest" ,rust-ntest-0.7) + ("rust-path-clean" ,rust-path-clean-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) + ("rust-reqwest" ,rust-reqwest-0.11) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha-1" ,rust-sha-1-0.9) ("rust-sourcemap" ,rust-sourcemap-6) - ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) - ("rust-tempfile" ,rust-tempfile-3)) - #:tests? #f ;; tests env_query_chrome_71 and project_env fail + ("rust-tempfile" ,rust-tempfile-3) + ("rust-url" ,rust-url-2) + ("rust-walkdir" ,rust-walkdir-2)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - (substitute* "ecmascript/jsdoc/src/lib.rs" - (("pub use self" all) - (string-append "#![feature(non_exhaustive)]\n" all))) - (substitute* "ecmascript/parser/src/lib.rs" - (("//! es2019" all) - (string-append "#![feature(non_exhaustive)] -#![feature(mem_take)] -#![feature(proc_macro_hygiene)] -" all))) - (substitute* "ecmascript/transforms/src/lib.rs" - (("#!\\[cfg_attr" all) - (string-append "#![feature(mem_take)]\n" all))) - #t)) - (add-after 'enable-unstable-features 'patch-build-failures - (lambda _ - (chmod ".cargo/config" 420) - (substitute* "ecmascript/transforms/macros/src/lib.rs" - (("use proc_macro::") - "extern crate proc_macro;\nuse proc_macro::")) - (substitute* "common/src/errors/emitter.rs" - ((" #\\[cfg\\(feature = \"tty-emitter\"\\)\\]\n") "")) - #t))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "target/release/swc" bin))))))) (home-page "https://swc.rs/") (synopsis "Typescript/javascript compiler") (description "@code{rust-swc} is a typescript/javascript compiler. It -- cgit v1.2.3 From 322b124936639ee9df8c32e3951b94be600ead80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:22:58 +0300 Subject: gnu: rust: Fix test failures on some architectures. * gnu/packages/rust.scm (rust)[arguments]: Adjust custom phase 'patch-process-tests to enable tests to pass on all architectures. --- gnu/packages/rust.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0dc60c8991..5e860057bc 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -845,10 +845,11 @@ safety and thread safety guarantees.") ;; emulation on aarch64 and riscv64 also fail on x86_64 in ;; Guix's build system. Skip them on all builds. (substitute* "sys/unix/process/process_common/tests.rs" - ,@(make-ignore-test-list - '("fn test_process_mask" - "fn test_process_group_posix_spawn" - "fn test_process_group_no_posix_spawn"))))))) + ;; We can't use make-ignore-test-list because we will get + ;; build errors due to the double [ignore] block. + (("target_arch = \"arm\"" arm) + (string-append "target_os = \"linux\",\n" + " " arm))))))) (add-after 'unpack 'disable-interrupt-tests (lambda _ ;; This test hangs in the build container; disable it. -- cgit v1.2.3 From 04c23574d8260994c6acef4cce17be177133ec2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:49 +0300 Subject: gnu: Add rust-vlq-0.5. * gnu/packages/crates-io.scm (rust-vlq-0.5): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b32b77dacf..fdcdc8a3a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77863,6 +77863,25 @@ updated when the crate version changes.") ("rust-toml" ,rust-toml-0.4) ("rust-url" ,rust-url-1)))))) +(define-public rust-vlq-0.5 + (package + (name "rust-vlq") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "vlq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zygijgl47gasi0zx34ak1jq2n4qmk0cx2zpn13shba157npxpb5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.5)))) + (home-page "https://github.com/tromey/vlq") + (synopsis "Sourcemap-style VLQ encoder and decoder") + (description "Sourcemap-style VLQ encoder and decoder.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-void-1 (package (name "rust-void") -- cgit v1.2.3 From 9c5b20359fb33e3e9b1bff4019ff620967b0585c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:49 +0300 Subject: gnu: Add rust-unreachable-0.1. * gnu/packages/crates-io.scm (rust-unreachable-0.1): New variable. --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fdcdc8a3a9..c13666d270 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76815,6 +76815,21 @@ clear display in the output.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unreachable-0.1 + (package + (inherit rust-unreachable-1) + (name "rust-unreachable") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "unreachable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14gzpm329nrfgjvxf6zh77sp7plxakcnsq8p8xk9474fn7fyaahz")))) + (arguments + `(#:cargo-inputs (("rust-void" ,rust-void-1)))))) + (define-public rust-unsafe-any-0.4 (package (name "rust-unsafe-any") -- cgit v1.2.3 From b9ace2d197a507e7d59a6f1c8bab4a64f0716b78 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:50 +0300 Subject: gnu: Add rust-unicode-id-0.3. * gnu/packages/crates-io.scm (rust-unicode-id-0.3): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c13666d270..63ba70e9ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76484,6 +76484,28 @@ Unicode and Internationalization Crates (UNIC) project.") membership for characters in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-id-0.3 + (package + (name "rust-unicode-id") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-id" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gq8mvi7cf4a13r9djb6xcf16jm58kic30kv36856s99cgwdxdmi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)))) + (home-page "https://github.com/Boshen/unicode-id") + (synopsis + "Determine whether characters have the ID_Start or ID_Continue properties") + (description + "Determine whether characters have the ID_Start or ID_Continue properties +according to Unicode Standard Annex #31.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-ident-1 (package (name "rust-unicode-ident") -- cgit v1.2.3 From 37ee0acfad6e79595c8a48011def784bf12b03bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:50 +0300 Subject: gnu: Add rust-serde-wasm-bindgen-0.3. * gnu/packages/crates-io.scm (rust-serde-wasm-bindgen-0.3): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 63ba70e9ab..e116e4fcd1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62077,6 +62077,35 @@ for later processing.") ("rust-indoc" ,rust-indoc-1) ("rust-serde-derive" ,rust-serde-derive-1)))))) +(define-public rust-serde-wasm-bindgen-0.3 + (package + (name "rust-serde-wasm-bindgen") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-wasm-bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fnv" ,rust-fnv-1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-maplit" ,rust-maplit-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://github.com/cloudflare/serde-wasm-bindgen") + (synopsis "Native Serde adapter for wasm-bindgen") + (description "Native Serde adapter for wasm-bindgen.") + (license license:expat))) + (define-public rust-serdect-0.2 (package (name "rust-serdect") -- cgit v1.2.3 From 87e0bade7c6a14dc13f654b8a72d717551a80564 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:50 +0300 Subject: gnu: Add rust-serde-regex-1. * gnu/packages/crates-io.scm (rust-serde-regex-1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e116e4fcd1..35f7145723 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61751,6 +61751,31 @@ using nested parameters, similar to those used by @code{qs} for Node, and commonly used by Ruby on Rails via Rack.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-regex-1 + (package + (name "rust-serde-regex") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-regex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pxsnxb8c198szghk1hvzvhva36w2q5zs70hqkmdf5d89qd6y4x8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/tailhook/serde-regex") + (synopsis "Serde wrapper that (de)serializes regex as strings") + (description + "This package provides a serde wrapper that (de)serializes regex as strings.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-repr-0.1 (package (name "rust-serde-repr") -- cgit v1.2.3 From 8f38b2b49cbc835d93d794ad94b026c196757e8e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:50 +0300 Subject: gnu: Add rust-ntest-proc-macro-helper-0.7. * gnu/packages/crates-io.scm (rust-ntest-proc-macro-helper-0.7): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 35f7145723..e096aad6e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43381,6 +43381,19 @@ framework.") macros used in ntest.") (license license:expat))) +(define-public rust-ntest-proc-macro-helper-0.7 + (package + (inherit rust-ntest-proc-macro-helper-0.8) + (name "rust-ntest-proc-macro-helper") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest-proc-macro-helper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lkyfx97aynbm7cnhzyc9cr0rpq1xzng1hwmzizbf1a6855y6llg")))))) + (define-public rust-ntex-bytes-0.1 (package (name "rust-ntex-bytes") -- cgit v1.2.3 From cf2e225ef89cf0997ffaa52e36dca94a7c489f01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:50 +0300 Subject: gnu: Add rust-ntest-timeout-0.7. * gnu/packages/crates-io.scm (rust-ntest-timeout-0.7): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e096aad6e1..e6d84c82b6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43364,6 +43364,26 @@ framework.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-ntest-timeout-0.7 + (package + (inherit rust-ntest-timeout-0.8) + (name "rust-ntest-timeout") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest-timeout" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08v3r6hggh43qabl887pkz88k6lg6hrc62mppxyabb0pw44v03di")))) + (arguments + `(#:cargo-inputs + (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.7) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-ntest-proc-macro-helper-0.8 (package (name "rust-ntest-proc-macro-helper") -- cgit v1.2.3 From 6b73f74d669578ef38584eb86400bd205955f462 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:51 +0300 Subject: gnu: Add rust-ntest-test-cases-0.7. * gnu/packages/crates-io.scm (rust-ntest-test-cases-0.7): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e6d84c82b6..245a742739 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43320,6 +43320,19 @@ enhances the built-in library with some useful features.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-ntest-test-cases-0.7 + (package + (inherit rust-ntest-test-cases-0.8) + (name "rust-ntest-test-cases") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest-test-cases" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ghal2rb03cnj7ciqgdq0dvifdf8qp2hnmi9z1ip1j5b02s1xa4r")))))) + (define-public rust-ntest-timeout-0.9 (package (name "rust-ntest-timeout") -- cgit v1.2.3 From de906a183bd696b075cad2b4797a9dfe6105494c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:51 +0300 Subject: gnu: Add rust-ntest-0.7. * gnu/packages/crates-io.scm (rust-ntest-0.7): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 245a742739..53fcd38170 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43280,6 +43280,25 @@ enhances the built-in library with some useful features.") #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))))) +(define-public rust-ntest-0.7 + (package + (inherit rust-ntest-0.8) + (name "rust-ntest") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i4xsvx52hmcnga2xbjl74hdylz4jy8bc2swcichlvw1di4lwm2w")))) + (arguments + `(#:cargo-inputs + (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.7) + ("rust-ntest-test-cases" ,rust-ntest-test-cases-0.7) + ("rust-ntest-timeout" ,rust-ntest-timeout-0.7)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-ntest-test-cases-0.9 (package (name "rust-ntest-test-cases") -- cgit v1.2.3 From 72a5e1f4b2e3a8c2bee7cd4d924ff81e23630b74 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:51 +0300 Subject: gnu: Add rust-normpath-0.2. * gnu/packages/crates-io.scm (rust-normpath-0.2): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 53fcd38170..acacf6fe42 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43082,6 +43082,26 @@ with all line endings.") ("rust-rustversion" ,rust-rustversion-1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-normpath-0.2 + (package + (inherit rust-normpath-1) + (name "rust-normpath") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "normpath" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y354v327vbcxap7ag88j81y4zifzhnjgxvn7l1s2d9cjb4si79a")))) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-notify-5 (package (name "rust-notify") -- cgit v1.2.3 From 830b2f1470b905ed1a3eaa3c5af34a6325bc618f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:51 +0300 Subject: gnu: Add rust-magic-string-0.3. * gnu/packages/crates-io.scm (rust-magic-string-0.3): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index acacf6fe42..69d2f693c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -37937,6 +37937,33 @@ algorithms. It supports CBC block cipher mode, PKCS5 padding and 64, 128, 192 or 256-bits key length.") (license license:asl2.0))) +(define-public rust-magic-string-0.3 + (package + (name "rust-magic-string") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "magic-string" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "062fjfvq17qm8ymqzq4y6wk7a3fmxqq9ysg40yrcrxs3ik73703c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-napi" ,rust-napi-2) + ("rust-napi-derive" ,rust-napi-derive-2) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-vlq" ,rust-vlq-0.5)))) + (home-page "https://github.com/h-a-n-a/magic-string-rs") + (synopsis "MagicString port driven by Rust and N-API") + (description + "This package provides a MagicString port driven by Rust and N-API.") + (license license:expat))) + (define-public rust-maildir-0.5 (package (name "rust-maildir") -- cgit v1.2.3 From acdbec6f4d73843a6f3df62e036eaa58dada620b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:51 +0300 Subject: gnu: Add rust-lexical-5. * gnu/packages/crates-io.scm (rust-lexical-5): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 69d2f693c2..bfb12c021f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35479,6 +35479,34 @@ a no_std environment. This does not depend on any standard library features, nor a system allocator.") (license (list license:expat license:asl2.0)))) +(define-public rust-lexical-5 + (package + (inherit rust-lexical-6) + (name "rust-lexical") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "lexical" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r8lsi523h53kbb99xgv31jabwhcp4rzqd4hfazfhcjffh5aj17l")))) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-lexical-core" ,rust-lexical-core-0.7) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.4) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-dtoa" ,rust-dtoa-0.4) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-ryu" ,rust-ryu-1)))))) + (define-public rust-lexiclean-0.0.1 (package (name "rust-lexiclean") -- cgit v1.2.3 From 41a41b65049bec061ffc7eaecf425600140e7bb8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:52 +0300 Subject: gnu: Add rust-generational-arena-0.2. * gnu/packages/crates-io.scm (rust-generational-arena-0.2): New variable. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bfb12c021f..d9f157916d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27332,6 +27332,39 @@ archive to be linked into Rustcode.") API library @code{gdi32}.") (license license:expat))) +(define-public rust-generational-arena-0.2 + (package + (name "rust-generational-arena") + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "generational-arena" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rwnfyprjwqafkwdz2irkds5a41jcjb3bsma3djknx4fy2pr8zl7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=cargo_readme_up_to_date") + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.8)))) + (home-page "https://github.com/fitzgen/generational-arena") + (synopsis "Arena allocator that supports deletion") + (description + "This package provides a safe arena allocator that supports deletion without +suffering from the ABA problem by using generational indices.") + (license license:mpl2.0))) + (define-public rust-generator-0.7 (package (name "rust-generator") -- cgit v1.2.3 From 019165eeae0fc72b5a9265c8ad8c1280e1adb431 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:52 +0300 Subject: gnu: Add rust-debugid-0.8. * gnu/packages/crates-io.scm (rust-debugid-0.8): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9f157916d..79c2bfeacc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19127,6 +19127,30 @@ debugger and run commands while verifying the output.") verifying the contents.") (license (list license:expat license:asl2.0)))) +(define-public rust-debugid-0.8 + (package + (name "rust-debugid") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "debugid" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13f15dfvn07fa7087pmacixqqv0lmj4hv93biw4ldr48ypk55xdy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://sentry.io/") + (synopsis "Common reusable types for implementing the sentry.io protocol") + (description + "Common reusable types for implementing the sentry.io protocol.") + (license license:asl2.0))) + (define-public rust-decimal-2 (package (name "rust-decimal") -- cgit v1.2.3 From ff6c43e7e40934888e8324e9764aae12bc4abba7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:52 +0300 Subject: gnu: Add rust-debug-unreachable-0.1. * gnu/packages/crates-io.scm (rust-debug-unreachable-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 79c2bfeacc..41f9db8408 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19074,6 +19074,27 @@ type.") the Debug trait manually.") (license license:expat))) +(define-public rust-debug-unreachable-0.1 + (package + (name "rust-debug-unreachable") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "debug-unreachable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cx4vh1d0bxdpb8l9lyiv03az4527lykxy39s4a958swf2n2w0ws")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unreachable" ,rust-unreachable-0.1)))) + (home-page "https://github.com/reem/rust-debug-unreachable.git") + (synopsis + "unreachable!() in debug, std::intrinsics::unreachable() in release") + (description + "unreachable!() in debug, std::intrinsics::unreachable() in release.") + (license license:expat))) + (define-public rust-debugger-test-0.1 (package (name "rust-debugger-test") -- cgit v1.2.3 From 1fbf13d1e3d88477a5226d438b9a969b930b0664 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:52 +0300 Subject: gnu: Add rust-core-extensions-0.1. * gnu/packages/crates-io.scm (rust-core-extensions-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 41f9db8408..9930ead5a6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15156,6 +15156,27 @@ numbers using the CORDIC method.") "Extensions for core/std library types, and other miscelaneous features.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-extensions-0.1 + (package + (inherit rust-core-extensions-1) + (name "rust-core-extensions") + (version "0.1.20") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-extensions" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nhgd5rlgp679qm4g3x806ywwhm6qr1y2j3y90wzjgyqllf7w49s")))) + (arguments + `(#:skip-build? #t ; failed to resolve: could not find `export` in `_serde` + #:cargo-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-core-extensions-proc-macros-1 (package (name "rust-core-extensions-proc-macros") -- cgit v1.2.3 From 2fd66b8d24547e50a6f2c37fb348eed02fe789f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:52 +0300 Subject: gnu: Add rust-browserslist-rs-0.6. * gnu/packages/crates-io.scm (rust-browserslist-rs-0.6): New variable. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9930ead5a6..3ca1b8da2d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9215,6 +9215,50 @@ and kernels.") decompression and compression to Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-browserslist-rs-0.6 + (package + (name "rust-browserslist-rs") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "browserslist-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19l0prgnbx0cyqvjsf30ni7d87nkn8j0fj56fg259yvfh50if1ri")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.7) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-either" ,rust-either-1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-napi" ,rust-napi-2) + ("rust-napi-build" ,rust-napi-build-1) + ("rust-napi-derive" ,rust-napi-derive-2) + ("rust-nom" ,rust-nom-7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-wasm-bindgen" ,rust-serde-wasm-bindgen-0.3) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-test-case" ,rust-test-case-1)))) + (home-page "https://github.com/browserslist/browserslist-rs") + (synopsis "Rust-ported Browserslist") + (description "Rust-ported Browserslist.") + (license license:expat))) + (define-public rust-bs58-0.2 (package (name "rust-bs58") -- cgit v1.2.3 From 7530227ef4580a2b1a342681307558de48376c09 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:53 +0300 Subject: gnu: Add rust-auto-impl-0.4. * gnu/packages/crates-io.scm (rust-auto-impl-0.4): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ca1b8da2d..b69960162f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5997,6 +5997,30 @@ they're not available.") "Automatically implement traits for common smart pointers and closures.") (license (list license:expat license:asl2.0)))) +(define-public rust-auto-impl-0.4 + (package + (inherit rust-auto-impl-0.5) + (name "rust-auto-impl") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "auto-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0f0aildq7rl7imgl6x6xw8jg4m08xz9q1bpcrmf5xnhar23gbjs2")))) + (arguments + `(#:cargo-test-flags + (list "--release" "--" "--skip=ui") + #:cargo-inputs + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))))) + (define-public rust-autocompress-0.2 (package (name "rust-autocompress") -- cgit v1.2.3 From 993c0ae6d2381d5ab0d683749cb5e15c088fa7fa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 10:23:53 +0300 Subject: gnu: Add rust-as-derive-utils-0.8. * gnu/packages/crates-io.scm (rust-as-derive-utils-0.8): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b69960162f..6dabdfc599 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4247,6 +4247,36 @@ the web.") the abi_stable and structural crates.") (license (list license:expat license:asl2.0)))) +(define-public rust-as-derive-utils-0.8 + (package + (inherit rust-as-derive-utils-0.10) + (name "rust-as-derive-utils") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "as-derive-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rjmbasb2spxdmm47kzw2zmr8icbdrcr0wa9kyn7lim5c0idh69b")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (arguments + `(#:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-core-extensions" ,rust-core-extensions-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-ron" ,rust-ron-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-askama-escape-0.10 (package (name "rust-askama-escape") -- cgit v1.2.3 From eeea0ec0f29d0c1bbe1be3007226c1bb6dd9f814 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:44:28 +0300 Subject: gnu: Add rust-y4m-0.8. * gnu/packages/crates-graphics.scm (rust-y4m-0.8): New variable. (rust-y4m-0.7): Inherit from rust-y4m-0.8. --- gnu/packages/crates-graphics.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index ba502982ad..04dee1ec09 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -3823,25 +3823,40 @@ the platform-specific getters provided by winit, or another library.") (description "This package provides X11 library bindings for Rust.") (license license:expat))) -(define-public rust-y4m-0.7 +(define-public rust-y4m-0.8 (package (name "rust-y4m") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (crate-uri "y4m" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bhdgb7hgx7j92nm6ij5n8wisp50j8ff66ks14jzwdw2mwhrjam7")))) + (base32 "0j24y2zf60lpxwd7kyg737hqfyqx16y32s0fjyi6fax6w4hlnnks")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-development-inputs (("rust-resize" ,rust-resize-0.4)))) (home-page "https://github.com/image-rs/y4m") (synopsis "YUV4MPEG2 (@file{.y4m}) encoder and decoder") (description "This package provides a YUV4MPEG2 (@file{.y4m}) encoder and decoder.") (license license:expat))) +(define-public rust-y4m-0.7 + (package + (inherit rust-y4m-0.8) + (name "rust-y4m") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "y4m" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bhdgb7hgx7j92nm6ij5n8wisp50j8ff66ks14jzwdw2mwhrjam7")))) + (arguments `(#:skip-build? #t)))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar -- cgit v1.2.3 From 3e8014c00c4b1421930d75f892b41bac7bb44ee1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:44:57 +0300 Subject: gnu: rust-assert-cmd-2: Update to 2.0.12. * gnu/packages/crates-io.scm (rust-assert-cmd-2): Update to 2.0.12. [arguments]: Don't skip build. [cargo-inputs]: Add rust-anstream-0.3, rust-anstyle-1, rust-yansi-0.5. Replace rust-bstr-0.2 with 1, rust-predicates-2 with 3. [cargo-development-inputs]: Add rust-escargot-0.5. --- gnu/packages/crates-io.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6dabdfc599..238128cebb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4744,26 +4744,27 @@ approximately equal.") (define-public rust-assert-cmd-2 (package (name "rust-assert-cmd") - (version "2.0.4") + (version "2.0.12") (source (origin (method url-fetch) (uri (crate-uri "assert_cmd" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gpqwasl690zimy13rn614mpzgykpa09v5xivs4pdmpg77fivblk")))) + (base32 "1rnzd84nqijp147nld05j5j92xpj2j57zfrm6c0d9r138yqkr448")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bstr" ,rust-bstr-0.2) - ("rust-concolor" ,rust-concolor-0.0.8) + `(#:cargo-inputs + (("rust-anstream" ,rust-anstream-0.3) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-bstr" ,rust-bstr-1) ("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-predicates" ,rust-predicates-2) + ("rust-predicates" ,rust-predicates-3) ("rust-predicates-core" ,rust-predicates-core-1) ("rust-predicates-tree" ,rust-predicates-tree-1) - ("rust-wait-timeout" ,rust-wait-timeout-0.2) - ("rust-yansi" ,rust-yansi-0.5)))) + ("rust-wait-timeout" ,rust-wait-timeout-0.2)) + #:cargo-development-inputs + (("rust-escargot" ,rust-escargot-0.5)))) (home-page "https://github.com/assert-rs/assert_cmd") (synopsis "Test CLI Applications") (description "@code{assert_cmd} aims to simplify the process for doing -- cgit v1.2.3 From e17b6f839e371749112d27b84c3bb846a099495d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:46:27 +0300 Subject: gnu: Add rust-itertools-0.11. * gnu/packages/crates-io.scm (rust-itertools-0.11): New variable. (rust-itertools-0.10): Inherit from rust-itertools-0.11. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 238128cebb..3ab5443420 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33987,23 +33987,23 @@ stream runs in a TTY.") (description "Parsing ISO8601 dates using nom.") (license license:expat))) -(define-public rust-itertools-0.10 +(define-public rust-itertools-0.11 (package (name "rust-itertools") - (version "0.10.5") + (version "0.11.0") (source (origin (method url-fetch) (uri (crate-uri "itertools" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh")))) + (base32 "0mzyqcc59azx9g5cg6fs8k529gvh4463smmka6jvzs3cd2jp7hdi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-either" ,rust-either-1)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) + (("rust-criterion" ,rust-criterion-0.4) ("rust-paste" ,rust-paste-1) ("rust-permutohedron" ,rust-permutohedron-0.2) ("rust-quickcheck" ,rust-quickcheck-0.9) @@ -34015,6 +34015,28 @@ stream runs in a TTY.") functions, and macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-itertools-0.10 + (package + (inherit rust-itertools-0.11) + (name "rust-itertools") + (version "0.10.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh")))) + (arguments + `(#:cargo-inputs + (("rust-either" ,rust-either-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7)))))) + (define-public rust-itertools-0.9 (package (inherit rust-itertools-0.10) -- cgit v1.2.3 From b6cdde9b074ecfc004e0b6263478129c39a491b0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:46:53 +0300 Subject: gnu: Add rust-predicates-3. * gnu/packages/crates-io.scm (rust-predicates-3): New variable. (rust-predicates-2): Inherit from rust-predicates-3. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ab5443420..dc08c25914 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50504,29 +50504,30 @@ libpq.") dependency to expose a precomputed hash.") (license license:expat))) -(define-public rust-predicates-2 +(define-public rust-predicates-3 (package (name "rust-predicates") - (version "2.1.0") + (version "3.0.4") (source (origin (method url-fetch) (uri (crate-uri "predicates" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05d749i3z8cbsr0899fzr2ksn8drbci4harcq82vjsj5krlagrcm")))) + (base32 "182q0wiabllvbg0nzfkf8a6qkbk0ckrkmfbk7k5ijgrfbibjiz3d")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + "--skip=path::fc::PredicateFileContentExt::from_file_path") #:cargo-inputs - (("rust-concolor-control" ,rust-concolor-control-0.0.7) + (("rust-anstyle" ,rust-anstyle-1) ("rust-difflib" ,rust-difflib-0.4) ("rust-float-cmp" ,rust-float-cmp-0.9) - ("rust-itertools" ,rust-itertools-0.10) + ("rust-itertools" ,rust-itertools-0.11) ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) ("rust-predicates-core" ,rust-predicates-core-1) - ("rust-regex" ,rust-regex-1) - ("rust-yansi" ,rust-yansi-0.5)) + ("rust-regex" ,rust-regex-1)) #:cargo-development-inputs (("rust-predicates-tree" ,rust-predicates-tree-1)))) (home-page "https://github.com/assert-rs/predicates-rs") @@ -50536,6 +50537,34 @@ dependency to expose a precomputed hash.") functions.") (license (list license:expat license:asl2.0)))) +(define-public rust-predicates-2 + (package + (inherit rust-predicates-3) + (name "rust-predicates") + (version "2.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "predicates" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pdd8zgw8351bvk882zadyqghnxzkjlf946vkdb1hgkzqdihl8sr")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=path::fc::PredicateFileContentExt::from_file_path") + #:cargo-inputs + (("rust-concolor" ,rust-concolor-0.0.11) + ("rust-difflib" ,rust-difflib-0.4) + ("rust-float-cmp" ,rust-float-cmp-0.9) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-regex" ,rust-regex-1) + ("rust-yansi" ,rust-yansi-0.5)) + #:cargo-development-inputs + (("rust-predicates-tree" ,rust-predicates-tree-1)))))) + (define-public rust-predicates-1 (package (inherit rust-predicates-2) -- cgit v1.2.3 From b234b1859c68ceb1291363cbd4c7169cd2542ce1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:47:19 +0300 Subject: gnu: rust-predicates-core-1: Update to 1.0.6. * gnu/packages/crates-io.scm (rust-predicates-core-1): Update to 1.0.6. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc08c25914..c3b94a56d2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50614,16 +50614,14 @@ functions.") (define-public rust-predicates-core-1 (package (name "rust-predicates-core") - (version "1.0.0") + (version "1.0.6") (source (origin (method url-fetch) (uri (crate-uri "predicates-core" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0y3ingf2i4xx7r61f1a8wizs57j8hh32hylyjbw9ymcj7qx5q1q6")))) + (base32 "0x7ij95n63mhgkyrb7hly5ngm41mwfsassfvnjz7lbk10wk0755p")))) (build-system cargo-build-system) (home-page "https://github.com/assert-rs/predicates-rs/tree/master/predicates-core") -- cgit v1.2.3 From abf509b7793ff4391cde29176d4c8e546b07f03d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:47:43 +0300 Subject: gnu: rust-predicates-tree-1: Update to 1.0.9. * gnu/packages/crates-io.scm (rust-predicates-tree-1): Update to 1.0.9. [cargo-inputs]: Add rust-termtree-0.4. Remove rust-treeline-0.1. [cargo-development-inputs]: Add rust-predicates-3. --- gnu/packages/crates-io.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c3b94a56d2..9f45855a10 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50648,21 +50648,21 @@ functions.") (define-public rust-predicates-tree-1 (package (name "rust-predicates-tree") - (version "1.0.0") + (version "1.0.9") (source (origin (method url-fetch) (uri (crate-uri "predicates-tree" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "090148qjilm2c722l873z7g31fhzj5j4qhd2xiv8mcqkj22w8qwf")))) + (base32 "1kyfq3r0s2vg94a9r59n7ar5gv66zvpa0s1fd6mm4l4czcas72rn")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-predicates-core" ,rust-predicates-core-1) - ("rust-treeline" ,rust-treeline-0.1)))) + ("rust-termtree" ,rust-termtree-0.4)) + #:cargo-development-inputs + (("rust-predicates" ,rust-predicates-3)))) (home-page "https://github.com/assert-rs/predicates-rs/tree/master/predicates-tree") (synopsis -- cgit v1.2.3 From bd15be7019f6fc4bea40437575af35388c3c76e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:48:27 +0300 Subject: gnu: rust-yansi-0.5: Update to 0.5.1. * gnu/packages/crates-io.scm (rust-yansi-0.5): Update to 0.5.1. [arguments]: Don't skip build. [cargo-development-inputs]: Add rust-serial-test-0.6. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f45855a10..89ec63fe49 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -82197,16 +82197,17 @@ Read/Write streams as well as low-level in-memory encoding and decoding.") (define-public rust-yansi-0.5 (package (name "rust-yansi") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (crate-uri "yansi" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wdx8syhc61lphmgw5cw1vq73isi4szjqriz1k07z19r3r59ziwz")))) + (base32 "1v4qljgzh73knr7291cgwrf56zrvhmpn837n5n5pypzq1kciq109")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.6)))) (home-page "https://github.com/SergioBenitez/yansi") (synopsis "Simple ANSI terminal color painting library") (description -- cgit v1.2.3 From ccee38a10cf845237f9606af2d8b6e858e86c082 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:49:12 +0300 Subject: gnu: rav1e: Update to 0.6.6. * gnu/packages/video.scm (rav1e): Update to 0.6.6. [source]: Add snippet to not hardcode dependency versions. [cargo-inputs]: Add rust-clap-lex-0.3, rust-winnow-0.4. Replace rust-y4m-0.7 with 0.8. Remove rust-const-fn-assert-0.1. [cargo-development-inputs]: Add rust-predicates-2, rust-predicates-core-1, rust-predicates-tree-1. --- gnu/packages/video.scm | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bb6ce0cbf1..b4dd7c27ae 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5341,16 +5341,19 @@ result in several formats: (define-public rav1e (package (name "rav1e") - (version "0.6.3") + (version "0.6.6") (source (origin (method url-fetch) (uri (crate-uri "rav1e" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0if94sfviy5cwljlnsy0f470ixfs090k54g416kcc0qd9w4rhy17")))) + (base32 "1h9fhmamb7mh3cv86y1qja9qb7r6w2jv3p8ydngvsyjy59lq7hqn")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -5368,8 +5371,8 @@ result in several formats: ("rust-cfg-if" ,rust-cfg-if-1) ("rust-clap" ,rust-clap-4) ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-clap-lex" ,rust-clap-lex-0.3) ("rust-console" ,rust-console-0.15) - ("rust-const-fn-assert" ,rust-const-fn-assert-0.1) ("rust-crossbeam" ,rust-crossbeam-0.8) ("rust-dav1d-sys" ,rust-dav1d-sys-0.7) ("rust-fern" ,rust-fern-0.6) @@ -5403,12 +5406,16 @@ result in several formats: ("rust-toml" ,rust-toml-0.5) ("rust-v-frame" ,rust-v-frame-0.3) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) - ("rust-y4m" ,rust-y4m-0.7)) + ("rust-winnow" ,rust-winnow-0.4) + ("rust-y4m" ,rust-y4m-0.8)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) ("rust-criterion" ,rust-criterion-0.4) ("rust-interpolate-name" ,rust-interpolate-name-0.2) ("rust-nom" ,rust-nom-7) + ("rust-predicates" ,rust-predicates-2) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-predicates-tree" ,rust-predicates-tree-1) ("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) @@ -5424,7 +5431,7 @@ result in several formats: (string-append "--prefix=" out))))) (add-after 'install 'delete-static-library (lambda* (#:key outputs #:allow-other-keys) - ;; Delete 80 MiB (!) static library. + ;; Delete 93 MiB (!) static library. (delete-file (string-append (assoc-ref outputs "out") "/lib/librav1e.a"))))))) (native-inputs -- cgit v1.2.3 From 3daa7f6277f78b953a4bcc667fbf92e5482b3551 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:50:34 +0300 Subject: gnu: Add rust-termtree-0.4. * gnu/packages/crates-io.scm (rust-termtree-0.4): New variable. --- gnu/packages/crates-io.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 89ec63fe49..0091816b7b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -70416,6 +70416,23 @@ bindings are a small wrapper around the raw C functions, which converts integer return values to @code{std::io::Result} to indicate success or failure.") (license license:expat))) +(define-public rust-termtree-0.4 + (package + (name "rust-termtree") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "termtree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xkal5l2r3r9p9j90x35qy4npbdwxz4gskvbijs6msymaangas9k")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-cli/termtree") + (synopsis "Visualize tree-like data on the command-line") + (description "Visualize tree-like data on the command-line.") + (license license:expat))) + (define-public rust-test-assembler-0.1 (package (name "rust-test-assembler") -- cgit v1.2.3 From cc6b84347b9c5e99a3c5722ee46f0ca86a99b31c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:50:34 +0300 Subject: gnu: Add rust-resize-0.4. * gnu/packages/crates-graphics.scm (rust-resize-0.4): New variable. --- gnu/packages/crates-graphics.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 04dee1ec09..5d5319a387 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2262,6 +2262,25 @@ AVIF format (powers the `cavif` tool).") (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-resize-0.4 + (package + (name "rust-resize") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "resize" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bamrw2m37l8q46mcy6snp6106d93dq7x67hbbj32w88pjdhxn84")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-png" ,rust-png-0.16)))) + (home-page "https://github.com/PistonDevelopers/resize") + (synopsis "Image resampling library in pure Rust") + (description "This package provides an image resampling library in pure Rust.") + (license license:expat))) + (define-public rust-rgb-0.8 (package (name "rust-rgb") -- cgit v1.2.3 From ae1e46e7e22fb27cbce751bbe241268a0772cebb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 14:59:49 +0300 Subject: gnu: Add rust-greetd-ipc-0.9. * gnu/packages/crates-io.scm (rust-greetd-ipc-0.9): New variable. (rust-greetd-ipc-0.8): Inherit from rust-greetd-ipc-0.9. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0091816b7b..03954395a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29226,8 +29226,35 @@ and loading crate.") ("rust-plain" ,rust-plain-0.2) ("rust-log" ,rust-log-0.4)))))) +(define-public rust-greetd-ipc-0.9 + (package + (name "rust-greetd-ipc") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "greetd-ipc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xl2cix3jv4sgigl5ijayab7rchr6v02za2qd87fv1z8dl1r14w3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://kl.wtf/projects/greetd") + (synopsis "@command{greetd} IPC protocol library for Rust") + (description + "This package provides library that helps you use the +@command{greetd} JSON-based IPC protocol from Rust.") + (license license:gpl3))) + (define-public rust-greetd-ipc-0.8 (package + (inherit rust-greetd-ipc-0.9) (name "rust-greetd-ipc") (version "0.8.0") (source (origin @@ -29237,20 +29264,13 @@ and loading crate.") (sha256 (base32 "1dscriv3adjyaxfaax3cmqrzx6q2vwwchbh86dhll783wjc4ivw0")))) - (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-async-trait" ,rust-async-trait-0.1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://kl.wtf/projects/greetd") - (synopsis "@command{greetd} IPC protocol library for Rust") - (description - "This package provides library that helps you use the -@command{greetd} JSON-based IPC protocol from Rust.") - (license license:gpl3))) + ("rust-tokio" ,rust-tokio-1)))))) (define-public rust-grep-0.2 (package -- cgit v1.2.3 From f64353c49a5a9acfe7e9930d69f0df195f9f73ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 15:00:26 +0300 Subject: gnu: wlgreet: Update to 0.4.1. * gnu/packages/admin.scm (wlgreet): Update to 0.4.1. [cargo-inputs]: Replace rust-greetd-ipc-0.8 with 0.9, rust-nix-0.15 with 0.25, rust-os-pipe-0.8 with 1, rust-rusttype-0.7 with 0.9. Remove rust-xml-rs-0.8. --- gnu/packages/admin.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 05e3936b0a..a8ece1688c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5488,7 +5488,7 @@ interfering with any pam-mount configuration."))) (define-public wlgreet (package (name "wlgreet") - (version "0.4") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -5497,25 +5497,24 @@ interfering with any pam-mount configuration."))) (file-name (git-file-name name version)) (sha256 (base32 - "00grp63n9nrgqls3knxfv9wjbc7p0jwr7i2vzxy750dz85gi2kzn")))) + "1k0jmgh0rjbnb49gkvs0a4d7z9xb6pad8v5w5f7my4s0rfpk7wd9")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-chrono" ,rust-chrono-0.4) ("rust-getopts" ,rust-getopts-0.2) - ("rust-greetd-ipc" ,rust-greetd-ipc-0.8) + ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memmap2" ,rust-memmap2-0.3) - ("rust-nix" ,rust-nix-0.15) - ("rust-os-pipe" ,rust-os-pipe-0.8) - ("rust-rusttype" ,rust-rusttype-0.7) + ("rust-nix" ,rust-nix-0.25) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-rusttype" ,rust-rusttype-0.9) ("rust-serde" ,rust-serde-1) ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.15) ("rust-toml" ,rust-toml-0.5) ("rust-wayland-client" ,rust-wayland-client-0.29) - ("rust-wayland-protocols" ,rust-wayland-protocols-0.29) - ("rust-xml-rs" ,rust-xml-rs-0.8)) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-bundled-fonts -- cgit v1.2.3 From 5333585cc57bd4524796b4c7525046c98c7211c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 15:14:27 +0300 Subject: gnu: Add rust-clap-mangen-0.1. * gnu/packages/crates-io.scm (rust-clap-mangen-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03954395a7..89ffacfd54 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12973,6 +12973,26 @@ stream of tokens.") (description "This package provides a manpage generator for clap.") (license (list license:expat license:asl2.0)))) +(define-public rust-clap-mangen-0.1 + (package + (inherit rust-clap-mangen-0.2) + (name "rust-clap-mangen") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "clap-mangen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zrpsp2lfrm1cgwsi7vlv9xlk4nbxrwnqksfbrgqsf3jbb080l8h")))) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-3) + ("rust-roff" ,rust-roff-0.2)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-3) + ("rust-snapbox" ,rust-snapbox-0.2)))))) + (define-public rust-clearscreen-1 (package (name "rust-clearscreen") -- cgit v1.2.3 From 1dbfb834baf67c91806b27ae9ec4e29dd25fb098 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 15:12:31 +0300 Subject: gnu: du-dust: Update to 0.8.6. * gnu/packages/admin.scm (du-dust): Update to 0.8.6. [arguments]: Add cargo-test-flags. Don't install the source. [cargo-inputs]: Add rust-ansi-term-0.12, rust-atty-0.2, rust-clap-mangen-0.1. Replace rust-lscolors-0.7 with 0.13, rust-sysinfo-0.15 with 0.27, rust-terminal-size-0.1 with 0.2. [cargo-development-inputs]: Replace rust-assert-cmd-1 with 2. --- gnu/packages/admin.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a8ece1688c..a3d26f0fe3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5906,33 +5906,38 @@ file or files to several hosts.") (define-public du-dust (package (name "du-dust") - (version "0.8.3") + (version "0.8.6") (source (origin (method url-fetch) (uri (crate-uri "du-dust" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1daif13rdd7wb8m5fbp6zif5b8znqcvmkxrjpp2w2famsp36sahx")))) + "1w52xdz1vi6awsvf4lph791zv13phjvz4ypmxr7f6pgxd3crr77c")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-clap" ,rust-clap-3) + `(#:cargo-test-flags + (list "--release" "--" + "--skip=test_apparent_size") + #:install-source? #f + #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-3) ("rust-clap-complete" ,rust-clap-complete-3) + ("rust-clap-mangen" ,rust-clap-mangen-0.1) ("rust-config-file" ,rust-config-file-0.2) ("rust-directories" ,rust-directories-4) - ("rust-lscolors" ,rust-lscolors-0.7) + ("rust-lscolors" ,rust-lscolors-0.13) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) ("rust-stfu8" ,rust-stfu8-0.2) - ("rust-sysinfo" ,rust-sysinfo-0.15) - ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-sysinfo" ,rust-sysinfo-0.27) + ("rust-terminal-size" ,rust-terminal-size-0.2) ("rust-thousands" ,rust-thousands-0.2) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-winapi-util" ,rust-winapi-util-0.1)) - #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-1) + #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/bootandy/dust") (synopsis "Graphical disk usage analyzer") -- cgit v1.2.3 From bed8878cdcc8040dcc19f98fc5ed199ebe3bef6e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 15:26:28 +0300 Subject: gnu: du-dust: Install manpage, shell completions. * gnu/packages/admin.scm (du-dust)[arguments]: Add a phase to install the manpage and shell completions. --- gnu/packages/admin.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a3d26f0fe3..a8d4269fbb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5938,7 +5938,22 @@ file or files to several hosts.") ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-winapi-util" ,rust-winapi-util-0.1)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-tempfile" ,rust-tempfile-3)))) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (install-file "man-page/dust.1" + (string-append share "/man/man1")) + (mkdir-p (string-append out "/etc/bash_completion.d")) + (copy-file "completions/dust.bash" + (string-append out "/etc/bash_completion.d/dust")) + (install-file "completions/dust.fish" + (string-append share "/fish/vendor_completions.d")) + (install-file "completions/_dust" + (string-append share "/zsh/site-fuctions")))))))) (home-page "https://github.com/bootandy/dust") (synopsis "Graphical disk usage analyzer") (description "This package provides a graphical disk usage analyzer in -- cgit v1.2.3 From f269dc33fca4ca1d9ecb5e6a085e56d1957c3068 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 15:32:56 +0300 Subject: gnu: rust-getrandom-0.2: Update to 0.2.10. * gnu/packages/crates-io.scm (rust-getrandom-0.2): Update to 0.2.10. [cargo-inputs]: Remove rust-stdweb-0.4. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 89ffacfd54..93250aba38 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27918,14 +27918,14 @@ platforms.") (define-public rust-getrandom-0.2 (package (name "rust-getrandom") - (version "0.2.8") + (version "0.2.10") (source (origin (method url-fetch) (uri (crate-uri "getrandom" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0cbb766pcyi7sws0fnp1pxkz0nhiya0ckallq502bxmq49mfnnn0")))) + (base32 "09zlimhhskzf7cmgcszix05wyz2i6fcpvh711cv1klsxl6r3chdy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -27934,7 +27934,6 @@ platforms.") ("rust-js-sys" ,rust-js-sys-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) - ("rust-stdweb" ,rust-stdweb-0.4) ("rust-wasi" ,rust-wasi-0.11) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs -- cgit v1.2.3 From afb201251f99936771688ab065cc5455bb1b87d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 15:33:25 +0300 Subject: gnu: rust-minisign: Update to 0.7.5. * gnu/packages/crates-io.scm (rust-minisign): Update to 0.7.5. [cargo-inputs]: Replace rust-getrandom-0.1 with 0.2, rust-rpassword-4 with 7, rust-scrypt-0.3 with 0.11. --- gnu/packages/crypto.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 67ced6ff4b..5989cc5991 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2017 Pierre Langlois -;;; Copyright © 2018, 2020, 2021 Efraim Flashner +;;; Copyright © 2018, 2020, 2021, 2023 Efraim Flashner ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018, 2020 Nicolò Balzarotti @@ -258,22 +258,20 @@ OpenBSD tool of the same name.") (define-public rust-minisign (package (name "rust-minisign") - (version "0.5.20") + (version "0.7.5") (source (origin (method url-fetch) (uri (crate-uri "minisign" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0xmcvh2snravghaar8igc6b9r3s1snnmf9qam9l3zyhm4987767y")))) + (base32 "1lmp83bxdg53c4n35fbwr3rkh6178y75fwsn25hf1kn62f2gbdnj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-getrandom" ,rust-getrandom-0.1) - ("rust-rpassword" ,rust-rpassword-4) - ("rust-scrypt" ,rust-scrypt-0.3)))) + (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-rpassword" ,rust-rpassword-7) + ("rust-scrypt" ,rust-scrypt-0.11)))) (home-page "https://github.com/jedisct1/rust-minisign") (synopsis "Crate to sign files and verify signatures") (description -- cgit v1.2.3 From 65ec4428b903e7107c99909e350eec32a46b4ad3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:00:41 +0300 Subject: gnu: rust-arrayvec-0.7: Update to 0.7.4. * gnu/packages/crates-io.scm (rust-arrayvec-0.7): Update to 0.7.4. [arguments]: Don't skip build. [cargo-inputs]: Add rust-zerioze-1. --- gnu/packages/crates-io.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 93250aba38..ba5791293b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3975,21 +3975,19 @@ structures.") (define-public rust-arrayvec-0.7 (package (name "rust-arrayvec") - (version "0.7.2") + (version "0.7.4") (source (origin (method url-fetch) (uri (crate-uri "arrayvec" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1mjl8jjqxpl0x7sm9cij61cppi7yi38cdrd1l8zjw7h7qxk2v9cd")))) + (base32 "04b7n722jij0v3fnm3qk072d5ysc2q30rl9fz33zpfhzah30mlwn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1)) + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) ("rust-matches" ,rust-matches-0.1) -- cgit v1.2.3 From e5815422a87a7e931cbd1d0f50bb610ae2acaae8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:01:26 +0300 Subject: gnu: Add rust-constant-time-eq-0.3. * gnu/packages/crates-io.scm (rust-constant-time-eq-0.3): New variable. (rust-constant-time-eq-0.2): Inherit from rust-constant-time-eq-0.3. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ba5791293b..b93a3a1d53 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14837,8 +14837,33 @@ generation.") "This package provides a sha1 implementation for use in const contexts.") (license (list license:asl2.0 license:expat)))) +(define-public rust-constant-time-eq-0.3 + (package + (name "rust-constant-time-eq") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "constant-time-eq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hl0y8frzlhpr58rh8rlg4bm53ax09ikj2i5fk7gpyphvhq4s57p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-count-instructions" ,rust-count-instructions-0.1) + ("rust-criterion" ,rust-criterion-0.5)))) + (home-page "https://github.com/cesarb/constant_time_eq") + (synopsis + "Compares two equal-sized byte strings in constant time") + (description + "This package compares two equal-sized byte strings in constant time. +It is inspired by the Linux kernel's @code{crypto_memneq}.") + (license (list license:cc0 license:expat-0 license:asl2.0)))) + (define-public rust-constant-time-eq-0.2 (package + (inherit rust-constant-time-eq-0.3) (name "rust-constant-time-eq") (version "0.2.5") (source (origin @@ -14848,16 +14873,8 @@ generation.") (sha256 (base32 "0sy7bs12dfa2d5hw7759b0mvjqcs85giajg4qyg39xq8a1s8wh8k")))) - (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)))) - (home-page "https://github.com/cesarb/constant_time_eq") - (synopsis - "Compares two equal-sized byte strings in constant time") - (description - "This package compares two equal-sized byte strings in constant time. -It is inspired by the Linux kernel's @code{crypto_memneq}.") - (license (list license:cc0 license:expat-0 license:asl2.0)))) + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)))))) (define-public rust-constant-time-eq-0.1 (package -- cgit v1.2.3 From 289ec877cd206e18deee85f433aea513d39fa556 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:02:17 +0300 Subject: gnu: Add rust-criterion-0.5. * gnu/packages/crates-io.scm (rust-criterion-0.5): New variable. (rust-criterion-0.4): Inherit from rust-criterion-0.5. --- gnu/packages/crates-io.scm | 65 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b93a3a1d53..d6e3098998 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16196,8 +16196,64 @@ Rust.") http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") (license (list license:expat license:asl2.0)))) +(define-public rust-criterion-0.5 + (package + (name "rust-criterion") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "criterion" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bv9ipygam3z8kk6k771gh9zi0j0lb9ir0xi1pc075ljg80jvcgj")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anes" ,rust-anes-0.1) + ("rust-async-std" ,rust-async-std-1) + ("rust-cast" ,rust-cast-0.3) + ("rust-ciborium" ,rust-ciborium-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-criterion-plot" ,rust-criterion-plot-0.5) + ("rust-csv" ,rust-csv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-plotters" ,rust-plotters-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smol" ,rust-smol-1) + ("rust-tinytemplate" ,rust-tinytemplate-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-futures" ,rust-futures-0.3) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://bheisler.github.io/criterion.rs/book/index.html") + (synopsis "Statistics-driven micro-benchmarking library") + (description + "This package provides a statistics-driven micro-benchmarking library.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-criterion-0.4 (package + (inherit rust-criterion-0.5) (name "rust-criterion") (version "0.4.0") (source (origin @@ -16207,7 +16263,6 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") (sha256 (base32 "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anes" ,rust-anes-0.1) @@ -16238,13 +16293,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-futures" ,rust-futures-0.3) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://bheisler.github.io/criterion.rs/book/index.html") - (synopsis "Statistics-driven micro-benchmarking library") - (description - "This package provides a statistics-driven micro-benchmarking library.") - ;; The user can choose either license. - (license (list license:asl2.0 license:expat)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-criterion-0.3 (package -- cgit v1.2.3 From 82f4391acab15bdb56a6b71ac3fe74d93faa4771 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:02:44 +0300 Subject: gnu: Add rust-memmap2-0.7. * gnu/packages/crates-io.scm (rust-memmap2-0.7): New variable. (rust-memmap2-0.5): Inherit from rust-memmap2-0.7. --- gnu/packages/crates-io.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d6e3098998..95144cf1aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39244,17 +39244,17 @@ file IO.") #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))))) -(define-public rust-memmap2-0.5 +(define-public rust-memmap2-0.7 (package (name "rust-memmap2") - (version "0.5.10") + (version "0.7.1") (source (origin (method url-fetch) (uri (crate-uri "memmap2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09xk415fxyl4a9pgby4im1v2gqlb5lixpm99dczkk30718na9yl3")))) + (base32 "1il82b0mw304jlwvl0m89aa8bj5dgmm3vbb0jg8lqlrk0p98i4zl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -39269,6 +39269,26 @@ file IO.") "This package provides a Rust API for memory-mapped file IO.") (license (list license:expat license:asl2.0)))) +(define-public rust-memmap2-0.5 + (package + (inherit rust-memmap2-0.7) + (name "rust-memmap2") + (version "0.5.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "memmap2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09xk415fxyl4a9pgby4im1v2gqlb5lixpm99dczkk30718na9yl3")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)) + #:cargo-development-inputs + (("rust-owning-ref" ,rust-owning-ref-0.4) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-memmap2-0.3 (package (inherit rust-memmap2-0.5) -- cgit v1.2.3 From c9c32a7a1c1109ec751b5cd631c53f9a2d9b7179 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:03:09 +0300 Subject: gnu: Add rust-page-size-0.6. * gnu/packages/crates-io.scm (rust-page-size-0.6): New variable. (rust-page-size-0.4): Inherit from rust-page-size-0.6. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 95144cf1aa..1f3ff744d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46628,22 +46628,22 @@ formatters with per-field documentation generated for each structure. "This package provides a library for padding strings at runtime.") (license license:expat))) -(define-public rust-page-size-0.4 +(define-public rust-page-size-0.6 (package (name "rust-page-size") - (version "0.4.2") + (version "0.6.0") (source (origin (method url-fetch) - (uri (crate-uri "page_size" version)) + (uri (crate-uri "page-size" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kgdv7f626jy4i2pq8czp4ppady4g4kqfa5ik4dah7mzzd4fbggf")))) + (base32 "1nj0rrwpvagagssljbm29ww1iyrrg15p1q4sk70r2cfi9qcv5m9h")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-spin" ,rust-spin-0.5) + ("rust-spin" ,rust-spin-0.9) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Elzair/page_size_rs") (synopsis "Retrieve the memory page size") @@ -46652,6 +46652,24 @@ formatters with per-field documentation generated for each structure. memory page size.") (license (list license:expat license:asl2.0)))) +(define-public rust-page-size-0.4 + (package + (inherit rust-page-size-0.6) + (name "rust-page-size") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "page_size" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kgdv7f626jy4i2pq8czp4ppady4g4kqfa5ik4dah7mzzd4fbggf")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-spin" ,rust-spin-0.5) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-pager-0.16 (package (name "rust-pager") -- cgit v1.2.3 From 52001584cae37101f2ac3d232eb41d70f1c9ee42 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:03:41 +0300 Subject: gnu: rust-serde-json-1: Update to 1.0.107. * gnu/packages/crates-io.scm (rust-serde-json-1): Update to 1.0.107. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1f3ff744d7..53261b10ea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62110,14 +62110,14 @@ data. This crate provides a wrapper that works with any existing Serde (define-public rust-serde-json-1 (package (name "rust-serde-json") - (version "1.0.102") + (version "1.0.107") (source (origin (method url-fetch) (uri (crate-uri "serde-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vfzj76zdn8yh5l08yzr6lf95whic3vrlkh6nq4266s8bncjl1mm")))) + (base32 "0r8cyb8nh3afb15yfscp1h8sdjfv6pnnwg14kcp8igfqwgk0qhkb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From fd75e263ee1d2cc2eac623b3d8e0cc00802449cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:04:08 +0300 Subject: gnu: rust-spin-0.9: Update to 0.9.8. * gnu/packages/crates-io.scm (rust-spin-0.9): Update to 0.9.8. [cargo-inputs]: Add rust-portable-atomic-1. [cargo-development-inputs]: Add rust-criterion-0.4. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 53261b10ea..8bbd766b08 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65777,18 +65777,21 @@ maximal amount of configuration possible intended.") (define-public rust-spin-0.9 (package (name "rust-spin") - (version "0.9.2") + (version "0.9.8") (source (origin (method url-fetch) (uri (crate-uri "spin" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rch0my17z66fam7hbynvrcs6jk63b08jv4s04mhdksv1jz584ji")))) + (base32 "0rvam5r0p3a6qhc18scqpvpgb3ckzyqxpgdfyjnghh8ja7byi039")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-lock-api" ,rust-lock-api-0.4)))) + (("rust-lock-api" ,rust-lock-api-0.4) + ("rust-portable-atomic" ,rust-portable-atomic-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4)))) (home-page "https://github.com/mvdnes/spin-rs") (synopsis "Synchronization primitives based on spinning") (description "This crate provides synchronization primitives based on -- cgit v1.2.3 From 806042ae9e831c16e27e18725bfb2d3709af5f5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:04:56 +0300 Subject: gnu: rust-tempfile-3: Update to 3.8.0. * gnu/packages/crates-io.scm (rust-tempfile-3): Update to 3.8.0. [cargo-inputs]: Replace rust-fastrand-1 with 2, rust-rustix-0.37 with 0.38, rust-windows-sys-0.45 with 0.48. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8bbd766b08..5aa384df4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -70016,22 +70016,22 @@ deleting all contents when it's dropped.") (define-public rust-tempfile-3 (package (name "rust-tempfile") - (version "3.5.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (crate-uri "tempfile" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "163rp254r3x7i5hisagrpxid2166pq94jvk511dpkmc1yf2fryxr")))) + (base32 "1vsl2193w3gpx3mwj36fwx3v6q2qyvmzrdn6m8fgfsjkrkrx556b")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-fastrand" ,rust-fastrand-1) + ("rust-fastrand" ,rust-fastrand-2) ("rust-redox-syscall" ,rust-redox-syscall-0.3) - ("rust-rustix" ,rust-rustix-0.37) - ("rust-windows-sys" ,rust-windows-sys-0.45)) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-windows-sys" ,rust-windows-sys-0.48)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://stebalien.com/projects/tempfile-rs") -- cgit v1.2.3 From 0294bff75db8c1f92f3e2c7b39854068efba7953 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:06:05 +0300 Subject: gnu: rust-blake3-1: Update to 1.5.0. * gnu/packages/crypto.scm (rust-blake3-1): Update to 1.5.0. [source]: Download using url-fetch. [arguments]: Skip tests. [cargo-inputs]: Add rust-memmap2-0.7, rust-serde-1, rust-zerioze-1. Replace rust-constant-time-eq-0.1 with 0.3, rust-digest-0.9 with 0.10. Remove rust-crypto-mac-0.11. [cargo-development-inputs]: Add rust-serde-json-1, rust-tempfile-3. Replace rust-page-size-0.4 with 0.6. Remove rust-cc-1. --- gnu/packages/crypto.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 5989cc5991..3aef4d3135 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1552,36 +1552,37 @@ SHA-3, and BLAKE2.") (define-public rust-blake3-1 (package (name "rust-blake3") - (version "1.0.0") - ;; The crate does not include the reference_impl directory. + (version "1.5.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BLAKE3-team/BLAKE3") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (crate-uri "blake3" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "09xi7rjyi5hgxyfpias485x5argwqygvfl9sggiw221qjdfxpbdn")))) + (base32 "11ysh12zcqq6xkjxh5cbrmnwzalprm3z552i5ff7wm5za9hz0c82")))) (build-system cargo-build-system) (arguments (list + #:tests? #f ; use of undeclared crate or module `reference_impl` #:cargo-inputs `(("rust-arrayref" ,rust-arrayref-0.3) ("rust-arrayvec" ,rust-arrayvec-0.7) ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-constant-time-eq" ,rust-constant-time-eq-0.1) - ("rust-crypto-mac" ,rust-crypto-mac-0.11) - ("rust-digest" ,rust-digest-0.9) - ("rust-rayon" ,rust-rayon-1)) + ("rust-constant-time-eq" ,rust-constant-time-eq-0.3) + ("rust-digest" ,rust-digest-0.10) + ("rust-memmap2" ,rust-memmap2-0.7) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs - `(("rust-cc" ,rust-cc-1) - ("rust-hex" ,rust-hex-0.4) - ("rust-page-size" ,rust-page-size-0.4) + `(("rust-hex" ,rust-hex-0.4) + ("rust-hmac" ,rust-hmac-0.12) + ("rust-page-size" ,rust-page-size-0.6) ("rust-rand" ,rust-rand-0.8) - ("rust-rand-chacha" ,rust-rand-chacha-0.3)))) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/BLAKE3-team/BLAKE3") (synopsis "BLAKE3 hash function Rust implementation") (description "This crate provides the official Rust implementation of the -- cgit v1.2.3 From d9745d6dbdf9d75d29fb83d03b29a9a595138aba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:08:30 +0300 Subject: gnu: b3sum: Update to 1.5.0. * gnu/packages/crypto.scm (b3sum): Update to 1.5.0. [cargo-inputs]: Replace rust-blake3-0.3 with 1, rust-clap-2 with 4. Remove rust-memmap-0.7. Add rust-memmap2-0.7. --- gnu/packages/crypto.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 3aef4d3135..c7145bcb0c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1595,16 +1595,14 @@ SHA-3, and BLAKE2.") (define-public b3sum (package (name "b3sum") - ;; Version 1 requires Rust >= 1.51. - ;; - (version "0.3.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (crate-uri "b3sum" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0h3fz16q5lk6mg7r8kjkjrq5hd4injngn5m7pswjbf2pyzjmg4b4")))) + (base32 "05k0vn7gpbvjr925vjc5yzvhiyrmkw9pqmch5fr4ir7s8wiaq2fm")))) (build-system cargo-build-system) (arguments `(;; Install the source so that Cargo.toml is installed, because that is @@ -1624,10 +1622,10 @@ SHA-3, and BLAKE2.") (install-file "README.md" doc))))) #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-blake3" ,rust-blake3-0.3) - ("rust-clap" ,rust-clap-2) + ("rust-blake3" ,rust-blake3-1) + ("rust-clap" ,rust-clap-4) ("rust-hex" ,rust-hex-0.4) - ("rust-memmap" ,rust-memmap-0.7) + ("rust-memmap2" ,rust-memmap2-0.7) ("rust-rayon" ,rust-rayon-1) ("rust-wild" ,rust-wild-2)) #:cargo-development-inputs -- cgit v1.2.3 From 0ae710f3721b338cd70fe09e7ee3c5cfa652d569 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:09:17 +0300 Subject: gnu: Add rust-count-instructions-0.1. * gnu/packages/crates-io.scm (rust-count-instructions-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5aa384df4a..7e61e54c4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15729,6 +15729,27 @@ intrinsics.") (description "This package provides a Manual coverage marks.") (license (list license:expat license:asl2.0)))) +(define-public rust-count-instructions-0.1 + (package + (name "rust-count-instructions") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "count-instructions" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ps0254pvx3nmnxs2v60kv7fqayh82r3jqypb4l3ql3i7s3rzr1n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rustix" ,rust-rustix-0.38)))) + (home-page "https://github.com/cesarb/count_instructions") + (synopsis "Counts the instructions executed within a single function") + (description "Counts the instructions executed within a single function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-countme-3 (package (name "rust-countme") -- cgit v1.2.3 From e254412070ee637e27be2e050bca7930e660edb4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 16:11:13 +0300 Subject: gnu: rust-oorandom-11: Rename from rust-oorandom-11.1. * gnu/packages/crates-io.scm (rust-oorandom-11): Use new name. (rust-criterion-0.5, rust-criterion-0.4, rust-criterion-0.3, rust-salsa-0.17): Use new name. * gnu/packages/rust-apps.scm (rust-analyzer): Same. --- gnu/packages/crates-io.scm | 10 +++++----- gnu/packages/rust-apps.scm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7e61e54c4a..d9887131a9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16248,7 +16248,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-itertools" ,rust-itertools-0.10) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-plotters" ,rust-plotters-0.3) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) @@ -16298,7 +16298,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-plotters" ,rust-plotters-0.3) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) @@ -16341,7 +16341,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-plotters" ,rust-plotters-0.3) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) @@ -45372,7 +45372,7 @@ be assigned to at most once and provide direct access to the stored contents.") (license (list license:expat license:asl2.0)))) -(define-public rust-oorandom-11.1 +(define-public rust-oorandom-11 (package (name "rust-oorandom") (version "11.1.3") @@ -59835,7 +59835,7 @@ in pure Rust.") ("rust-indexmap" ,rust-indexmap-1.7) ("rust-lock-api" ,rust-lock-api-0.4) ("rust-log" ,rust-log-0.4) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-salsa-macros" ,rust-salsa-macros-0.17) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index f9c14dbdbd..d1a5da66d9 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1955,7 +1955,7 @@ background agent taking care of maintaining the necessary state.") (("rust-arbitrary" ,rust-arbitrary-1) ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) ("rust-expect-test" ,rust-expect-test-1) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-quote" ,rust-quote-1.0.10) ("rust-rayon" ,rust-rayon-1) ("rust-tracing" ,rust-tracing-0.1) -- cgit v1.2.3 From 3a40929034b5bc3491ff50598f66d525e10f2be5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 17:29:20 +0300 Subject: gnu: rust-pyo3: Update to 0.19.2. * gnu/packages/crates-io.scm (rust-pyo3): Update to 0.19.2. [cargo-inputs]: Replace rust-hashbrown-0.12 with 0.14, rust-indexmap-1 with 2. [cargo-development-inputs]: Remove rust-criterion-0.3. (rust-pyo3-build-config-0.19, rust-pyo3-ffi-0.19, rust-pyo3-macros-backend-0.19, rust-pyo3-macros-0.19): Update to 0.19.2. --- gnu/packages/crates-io.scm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9887131a9..3b455b4907 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52326,14 +52326,14 @@ they were parsed from") (define-public rust-pyo3-build-config-0.19 (package (name "rust-pyo3-build-config") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-build-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1c4n6dvv79p5mb558nz1cb0ifgxbhw9gjs0j1ff0l61w1d7v4kam")))) + "19bb7aqyvr4kmh8b2lnrmcv9251j8yxw7l7xyr77m3s3pk876v07")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -52410,14 +52410,14 @@ ecosystem.") (define-public rust-pyo3-ffi-0.19 (package (name "rust-pyo3-ffi") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-ffi" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "193hg837vk0c9b4fxxx4bp2vjm4n4m0sx59ivba0lq78b63xwblj")))) + "1nc4696k03ydyiy1f69l3ywknavjzxzag2mscrh2bgkywx1fwg75")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -52495,14 +52495,14 @@ extension to python.") (define-public rust-pyo3-macros-backend-0.19 (package (name "rust-pyo3-macros-backend") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12zs1vx0h4hainb0lpnw8knd9i9l0g2rdzdnrmb1bnv0n75qrdz0")))) + "0dlm4pg29hjmlqx15gcy9cmnabvc8ycy60hcvjg8hm62flhw2zcl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -52576,14 +52576,14 @@ extension to python.") (define-public rust-pyo3-macros-0.19 (package (name "rust-pyo3-macros") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18n57jpi3292jhzmg5bjr1343zl93gmvxz21m1j5jdfxl73awp4a")))) + "1lggr5pnpmdj0cznlhw7ykm1qka3wlymwzfxqql6a4vyb6clrsyz")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -52676,14 +52676,14 @@ extension to python.") (define-public rust-pyo3-0.19 (package (name "rust-pyo3") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nca4p22jxwcg5dvg907j9m9618bvi8lmb20vvy4nsrhbzh8mf7z")))) + "0f1aqx947mzsrk05zdm9w2702lj5k9s97y9w9lxwkp2avk7sd0g6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -52691,8 +52691,8 @@ extension to python.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-eyre" ,rust-eyre-0.6) - ("rust-hashbrown" ,rust-hashbrown-0.12) - ("rust-indexmap" ,rust-indexmap-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) ("rust-indoc" ,rust-indoc-1) ("rust-inventory" ,rust-inventory-0.3) ("rust-libc" ,rust-libc-0.2) @@ -52709,7 +52709,6 @@ extension to python.") #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1) ("rust-chrono" ,rust-chrono-0.4) - ("rust-criterion" ,rust-criterion-0.3) ("rust-proptest" ,rust-proptest-0.10) ("rust-rayon" ,rust-rayon-1) ("rust-rust-decimal" ,rust-rust-decimal-1) -- cgit v1.2.3 From ca6e2c8cce27aeb1f08cc1a5ceaa3a065ef59ffb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 17:31:12 +0300 Subject: gnu: rust-smallvec-1: Update to 1.11.1. * gnu/packages/crates-io.scm (rust-smallvec-1): Update to 1.11.1. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3b455b4907..ed32d1c90e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -65032,16 +65032,14 @@ inline storage.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.10.0") + (version "1.11.1") (source (origin (method url-fetch) (uri (crate-uri "smallvec" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1q2k15fzxgwjpcdv3f323w24rbbfyv711ayz85ila12lg7zbw1x5")))) + (base32 "0nmx8aw3v4jglqdcjv4hhn10d6g52c4bhjlzwf952885is04lawl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From ab8a943b9a919f3230bf9cf86b6133eb3771287d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 17:31:40 +0300 Subject: gnu: python-orjson: Update to 3.9.7. * gnu/packages/python-xyz.scm (python-orjson): Update to 3.9.7. [arguments]: Remove 'prepare-python-module, 'install-python-library phases. [cargo-inputs]: Replace rust-pyo3-ffi-0.18 with 0.19. Add rust-cc-1, rust-pyo3-build-config-0.19, rust-version-check-0.9. [inputs]: Add maturin. [native-inputs]: Remove python-pypa-build, python-wheel. --- gnu/packages/python-xyz.scm | 57 ++++++++++----------------------------------- 1 file changed, 12 insertions(+), 45 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 19352b41dc..34cfc07307 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -246,6 +246,7 @@ #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages regex) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages scanner) #:use-module (gnu packages sdl) #:use-module (gnu packages search) @@ -3031,13 +3032,13 @@ help formatter.") (define-public python-orjson (package (name "python-orjson") - (version "3.8.8") + (version "3.9.7") (source (origin (method url-fetch) (uri (pypi-uri "orjson" version)) (sha256 (base32 - "1nn617pzn8smjkf7j593ybq16qfnj53bla52qjwzzrms4fjxg5n0")))) + "0hh1j7akxgx1nvsnwx1p4f4h4pkgr7v9aqr99l2pwbwfyyc93qw5")))) (build-system cargo-build-system) (arguments (list @@ -3048,47 +3049,10 @@ help formatter.") (guix build utils)) #:phases #~(modify-phases %standard-phases - (add-after 'install 'prepare-python-module - (lambda _ - ;; We don't use maturin. - (delete-file "pyproject.toml") - (call-with-output-file "pyproject.toml" - (lambda (port) - (format port "\ -[build-system] -build-backend = 'setuptools.build_meta' -requires = ['setuptools'] -"))) - (call-with-output-file "setup.cfg" - (lambda (port) - (format port "\ -[metadata] -name = orjson -version = ~a - -[options] -packages = find: - -[options.packages.find] -exclude = - src - integration - test - Cargo.toml -" #$version))))) (add-after 'prepare-python-module 'build-python-module (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module - (assoc-ref py:%standard-phases 'install)) - (add-after 'install-python-module 'install-python-library - (lambda _ - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages"))) - (mkdir-p site) - (copy-file "target/release/liborjson.so" - (string-append site "/orjson.so")))))) + (assoc-ref py:%standard-phases 'install))) #:cargo-inputs `(("rust-ahash" ,rust-ahash-0.8) ("rust-arrayvec" ,rust-arrayvec-0.7) @@ -3101,17 +3065,20 @@ exclude = ("rust-itoa" ,rust-itoa-1) ("rust-itoap" ,rust-itoap-1) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.18) + ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.19) ("rust-ryu" ,rust-ryu-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-simdutf8" ,rust-simdutf8-0.1) - ("rust-smallvec" ,rust-smallvec-1)) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-cc" ,rust-cc-1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.19) + ("rust-version-check" ,rust-version-check-0.9)) #:install-source? #false)) + (inputs + (list maturin)) (native-inputs - (list python-wrapper - python-pypa-build - python-wheel)) + (list python-wrapper)) (home-page "https://github.com/ijl/orjson") (synopsis "Python JSON library supporting dataclasses, datetimes, and numpy") (description "Orjson is a fast, correct JSON library for Python. It -- cgit v1.2.3 From 395ed95e70948a73249996fb0feecf3b590186e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 17:33:19 +0300 Subject: gnu: python-pyopenssl: Update to 23.2.0. * gnu/packages/python-crypto.scm (python-pyopenssl): Update to 23.2.0. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 466cfa35db..b787d6207f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -613,14 +613,14 @@ ciphers, message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "23.1.1") + (version "23.2.0") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "1dxhip610zw1j2bz35g1w1h7vh374g0bnzn4nsqj65n6pswrh544")))) + "1b4bkcpzhmablf592g21rq3l8apbhklp6wcwlvgfflm4algr6vr7")))) (build-system python-build-system) (arguments (list -- cgit v1.2.3 From 48e5110c25cf47dce46fb90980d8902f4236cf99 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Oct 2023 20:06:49 +0300 Subject: gnu: rust-simdutf8-0.1: Update to 0.1.4. * gnu/packages/crates-io.scm (rust-simdutf8-0.1): Update to 0.1.4. [arguments]: Don't skip build. Skip the tests. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ed32d1c90e..4a94a01fa5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -64195,16 +64195,16 @@ implementation in Rust.") (define-public rust-simdutf8-0.1 (package (name "rust-simdutf8") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (crate-uri "simdutf8" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nama0xqzbl8x72fqd8nhgvwjhg2vqj0gkv1la8gm0n6wwbdlw69")))) + (base32 "0fi6zvnldaw7g726wnm9vvpv4s89s5jsk7fgp3rg2l99amw64zzj")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments `(#:tests? #f)) (home-page "https://github.com/rusticstuff/simdutf8") (synopsis "SIMD-accelerated UTF-8 validation") (description -- cgit v1.2.3 From 14165eaaa0064885b88920aea27756ee7af24ecb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 12:13:15 +0300 Subject: gnu: rust-actix-web-codegen-0.2: Fix inputs. * gnu/packages/crates-io.scm (rust-actix-web-codegen-0.2) [cargo-development-inputs]: Replace rust-actix-web-2 with 3. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a94a01fa5..636e64d664 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1656,7 +1656,7 @@ Rust.") ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs (("rust-actix-rt" ,rust-actix-rt-1) - ("rust-actix-web" ,rust-actix-web-2)))))) + ("rust-actix-web" ,rust-actix-web-3)))))) (define-public rust-actix-web-codegen-0.1 (package -- cgit v1.2.3 From c68f15cd8e46766fbfc98dcdc13743c834af23e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 12:13:59 +0300 Subject: gnu: rust-addr2line-0.17: Fix building. * gnu/packages/crates-io.scm (rust-addr2line-0.17)[source]: Add snippet to correctly build one of the dependency crates. --- gnu/packages/crates-io.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 636e64d664..32301bcde5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1869,9 +1869,17 @@ Rust, using gimli.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0sw16zqy6w0ar633z69m7lw6gb0k1y7xj3387a8wly43ij5div5r")))) + "0sw16zqy6w0ar633z69m7lw6gb0k1y7xj3387a8wly43ij5div5r")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml.orig" + (("(cpp_demangle =.*)default-features = false,(.*)" _ first last) + (string-append first last)) + ((".*auxiliary.*") "")) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (arguments - `(#:tests? #false ;use of undeclared crate or module `auxiliary` + `(#:tests? #false ; Not all files included. #:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-cpp-demangle" ,rust-cpp-demangle-0.3) -- cgit v1.2.3 From 04ace10cac8b8518301918e33974e352026f34a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 12:25:57 +0300 Subject: gnu: rust-afl-0.8: Remove check-for-pregenerated-files phase. * gnu/packages/crates-io.scm (rust-afl-0.8)[arguments]: Add a phase to remove the 'check-for-pregenerated-files phase. --- gnu/packages/crates-io.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32301bcde5..532bcd0694 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2507,7 +2507,7 @@ This package is deprecated and was replaced by the @code{aes} crate.") (base32 "1rw11hycfjhqbc7z1smn75m0sczq519msjwimxh7b8s6n4pzk5r7")))) (arguments - `(#:skip-build? #t + `(#:skip-build? #t ; Build wants AFL #:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-clap" ,rust-clap-2) @@ -2517,7 +2517,10 @@ This package is deprecated and was replaced by the @code{aes} crate.") ("rust-xdg" ,rust-xdg-2)) #:cargo-development-inputs (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-xdg" ,rust-xdg-2)))))) + ("rust-xdg" ,rust-xdg-2)) + #:phases (modify-phases %standard-phases + ;; Custom archive file for test suite. + (delete 'check-for-pregenerated-files)))))) (define-public rust-ahash-0.8 (package -- cgit v1.2.3 From b2de124e15e8f7794c75a91ba2534203f26cda14 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 12:27:08 +0300 Subject: gnu: rust-afl-0.12: Remove check-for-pregenerated-files phase. * gnu/packages/crates-io.scm (rust-afl-0.12)[arguments]: Add a phase to remove the 'check-for-pregenerated-files phase. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 532bcd0694..cc888a305c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2484,7 +2484,10 @@ This package is deprecated and was replaced by the @code{aes} crate.") #:cargo-development-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-tempfile" ,rust-tempfile-3)))) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases (modify-phases %standard-phases + ;; Custom archive file for test suite. + (delete 'check-for-pregenerated-files)))) (home-page "https://github.com/rust-fuzz/afl.rs") (synopsis "Fuzzing Rust code with american-fuzzy-lop") -- cgit v1.2.3 From 9db579fdc2d199c6577b9b3854c6ae6a427ca7a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 12:37:30 +0300 Subject: gnu: rust-cookie-0.14: Update to 0.14.4. * gnu/packages/crates-io.scm (rust-cookie-0.14): Update to 0.14.4. [cargo-inputs]: Replace rust-aes-gcm-0.6 with 0.8, rust-base64-0.12 with 0.13, rust-hkdf-0.9 with 0.10, rust-hmac-0.8 with 0.10, rust-rand-0.7 with 0.8. Add rust-version-check-0.9. [cargo-development-inputs]: Remove rust-version-check-0.9. --- gnu/packages/crates-io.scm | 51 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc888a305c..a0d50a87df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15094,6 +15094,31 @@ It supports signed and private (encrypted + signed) jars.") ("rust-time" ,rust-time-0.2) ("rust-version-check" ,rust-version-check-0.9)))))) +(define-public rust-cookie-0.14 + (package + (inherit rust-cookie-0.15) + (name "rust-cookie") + (version "0.14.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "cookie" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ldryjb41r8n0ar2pya0bajlxr8s4j59fjkmyi5ppg1932rdg983")))) + (arguments + `(#:cargo-inputs + (("rust-aes-gcm" ,rust-aes-gcm-0.8) + ("rust-base64" ,rust-base64-0.13) + ("rust-hkdf" ,rust-hkdf-0.10) + ("rust-hmac" ,rust-hmac-0.10) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-rand" ,rust-rand-0.8) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-time" ,rust-time-0.2) + ("rust-version-check" ,rust-version-check-0.9)))))) + (define-public rust-cookie-0.12 (package (inherit rust-cookie-0.15) @@ -15369,32 +15394,6 @@ numbers using the CORDIC method.") in @code{no_std}. Alloc support is optional.") (license (list license:asl2.0 license:expat)))) -(define-public rust-cookie-0.14 - (package - (inherit rust-cookie-0.15) - (name "rust-cookie") - (version "0.14.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "cookie" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1q56fl2cqrci9ksa80d7g220phq02nf1yfbvxkpk9g1p95ma2wqk")))) - (arguments - `(#:cargo-inputs - (("rust-aes-gcm" ,rust-aes-gcm-0.6) - ("rust-base64" ,rust-base64-0.12) - ("rust-hkdf" ,rust-hkdf-0.9) - ("rust-hmac" ,rust-hmac-0.8) - ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-rand" ,rust-rand-0.7) - ("rust-sha2" ,rust-sha2-0.9) - ("rust-time" ,rust-time-0.2)) - #:cargo-development-inputs - (("rust-version-check" ,rust-version-check-0.9)))))) - (define-public rust-cookie-store-0.19 (package (name "rust-cookie-store") -- cgit v1.2.3 From 5bf67e673673ca3b3e306a205551856ad8ea7548 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 12:49:16 +0300 Subject: gnu: rust-aesni-0.7: Skip build. * gnu/packages/crates-io.scm (rust-aesni-0.7)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a0d50a87df..824041fd82 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2431,7 +2431,8 @@ This package is deprecated and was replaced by the @code{aes} crate.") (base32 "0r6j0mjkyqnwvgib01cvrwfw8rlx1biw75234niv723n1fdx6l6h")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-block-cipher" ,rust-block-cipher-0.7) ("rust-opaque-debug" ,rust-opaque-debug-0.2) ("rust-stream-cipher" ,rust-stream-cipher-0.4)) -- cgit v1.2.3 From 4ab9a2194a5ac1c47546c46adb553822f7eda79d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 13:36:10 +0300 Subject: gnu: rust-autocompress-0.2: Skip build. * gnu/packages/crates-io.scm (rust-autocompress-0.2)[arguments]: Skip build. [native-inputs]: Add pkg-config. --- gnu/packages/crates-io.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 824041fd82..88b0d24b69 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6080,15 +6080,7 @@ they're not available.") (arguments (list #:tests? #false ;The crate does not include test files - #:phases - '(modify-phases %standard-phases - (add-before 'patch-cargo-checksums 'do-not-build-xz - (lambda _ - ;; Detection of liblzma (in rust-lzma-sys, pulled in by - ;; rust-hts-sys) doesn't seem to work, or perhaps it really does - ;; request a static build somewhere. - (substitute* "guix-vendor/rust-lzma-sys-0.1.17.tar.xz/build.rs" - (("if .want_static && .msvc && pkg_config::probe_library\\(\"liblzma\"\\).is_ok\\(\\)") ""))))) + #:skip-build? #t ; could not find `block` in `zstd` #:cargo-inputs `(("rust-brotli" ,rust-brotli-3) ("rust-bzip2" ,rust-bzip2-0.4) @@ -6105,6 +6097,7 @@ they're not available.") ("rust-rand" ,rust-rand-0.8) ("rust-temp-testdir" ,rust-temp-testdir-0.2)))) (inputs (list xz)) + (native-inputs (list pkg-config)) (home-page "https://github.com/informationsea/autocompress-rs") (synopsis "Select decoder from magic bytes or encoder from file extension") (description -- cgit v1.2.3 From d631d901d8afe5fcf326c91203d73a34b99dde0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 13:36:46 +0300 Subject: build: cargo-build-system: Disable tests by default. * guix/build-system/cargo.scm (cargo-build): Disable tests by default. * gnu/packages/admin.scm (greetd, wlgreet, du-dust), * gnu/packages/bioinformatics.scm (circtools, python-gseapy), * gnu/packages/crypto.scm (rust-minisign, b3sum), * gnu/packages/gnome.scm (librsvg), * gnu/packages/python-crypto.scm (python-blake3, python-cryptography-rust), * gnu/packages/python-xyz.scm (python-orjson), * gnu/packages/rust-apps.scm (agate, alfis, bat, diffr, drill, dutree, exa, fd, hexyl, hyperfine, i3status-rust, just, maturin, ripgrep, rot8, rust-swc, rust-cargo-edit, git-interactive-rebase-tool, rust-cbindgen, rust-cbindgen-0.24, rust-cbindgen-0.19, sniffglue, tectonic, treefmt, hex, tokei, vivid, watchexec, rbw, rust-analyzer, rust-cargo-c, rtss, skim, skim-0.7, svd2rust, swayhide, tealdeer, git-absorb, zoxide, htmlq), * gnu/packages/sequoia.scm (sequoia-sqv), * gnu/packages/syndication.scm (newsboat), * gnu/packages/terminals.scm (alacritty), * gnu/packages/text-editors.scm (kak-lsp, parinfer-rust), * gnu/packages/tree-sitter.scm (tree-sitter-cli), * gnu/packages/video.scm (rav1e), * gnu/packages/web.scm (monolith, castor) [arguments]: Enable tests. --- gnu/packages/admin.scm | 7 ++- gnu/packages/bioinformatics.scm | 2 + gnu/packages/crypto.scm | 6 ++- gnu/packages/gnome.scm | 1 + gnu/packages/python-crypto.scm | 2 + gnu/packages/python-xyz.scm | 1 + gnu/packages/rust-apps.scm | 106 +++++++++++++++++++++++++++------------- gnu/packages/sequoia.scm | 3 +- gnu/packages/syndication.scm | 1 + gnu/packages/terminals.scm | 3 +- gnu/packages/text-editors.scm | 6 ++- gnu/packages/tree-sitter.scm | 1 + gnu/packages/video.scm | 3 +- gnu/packages/web.scm | 8 +-- guix/build-system/cargo.scm | 2 +- 15 files changed, 106 insertions(+), 46 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a8d4269fbb..0b21d34a6a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5395,7 +5395,8 @@ it won't take longer to install 15 machines than it would to install just 2.") (base32 "1b79lb0vikh5vwpdlyga6zwzm11gpsd7ghp8zb0q2m6mlqlj5by3")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-nix" ,rust-nix-0.26) ("rust-pam-sys" ,rust-pam-sys-0.5) ("rust-rpassword" ,rust-rpassword-5) @@ -5500,7 +5501,8 @@ interfering with any pam-mount configuration."))) "1k0jmgh0rjbnb49gkvs0a4d7z9xb6pad8v5w5f7my4s0rfpk7wd9")))) (build-system cargo-build-system) (arguments - (list #:cargo-inputs + (list #:tests? #~(not (%current-target-system)) + #:cargo-inputs `(("rust-chrono" ,rust-chrono-0.4) ("rust-getopts" ,rust-getopts-0.2) ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) @@ -5919,6 +5921,7 @@ file or files to several hosts.") `(#:cargo-test-flags (list "--release" "--" "--skip=test_apparent_size") + #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 45afde699d..44eeb53e95 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2654,6 +2654,7 @@ compressed files.") (("find_package\\(biosoup 0.10.0 QUIET\\)") "find_package(biosoup 0.10.0 CONFIG)") (("GTest_FOUND") "TRUE"))))) + #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-bio" ,rust-bio-0.33) @@ -21101,6 +21102,7 @@ handling."))) (build-system cargo-build-system) (arguments (list + #:tests? #~(not (%current-target-system)) #:install-source? #false #:features '(list "extension-module") #:cargo-test-flags '(list "--features=extension-module") diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index c7145bcb0c..d4eb667286 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -268,7 +268,8 @@ OpenBSD tool of the same name.") (base32 "1lmp83bxdg53c4n35fbwr3rkh6178y75fwsn25hf1kn62f2gbdnj")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2) ("rust-rpassword" ,rust-rpassword-7) ("rust-scrypt" ,rust-scrypt-0.11)))) @@ -1605,7 +1606,8 @@ SHA-3, and BLAKE2.") (base32 "05k0vn7gpbvjr925vjc5yzvhiyrmkw9pqmch5fr4ir7s8wiaq2fm")))) (build-system cargo-build-system) (arguments - `(;; Install the source so that Cargo.toml is installed, because that is + `(#:tests? ,(not (%current-target-system)) + ;; Install the source so that Cargo.toml is installed, because that is ;; the only reference to the license information. #:install-source? #t #:phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 865ff3b9d7..5fcc9409ef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3513,6 +3513,7 @@ for dealing with different structured file formats.") (outputs '("out" "doc" "debug")) (arguments (list + #:tests? #~(not (%current-target-system)) #:install-source? #f #:modules '((guix build cargo-build-system) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b787d6207f..f7f8a60d23 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -362,6 +362,7 @@ risk.") (build-system cargo-build-system) (arguments (list + #:tests? #~(not (%current-target-system)) #:phases #~(modify-phases %standard-phases (add-after 'install 'build-python-module @@ -568,6 +569,7 @@ ciphers, message digests and key derivation functions.") (guix build utils) (srfi srfi-1) (ice-9 match)) + #:tests? #~(not (%current-target-system)) #:install-source? #f ;; As seen in noxfile.py #:cargo-test-flags ''("--release" "--no-default-features") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 34cfc07307..fcce6ca425 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3053,6 +3053,7 @@ help formatter.") (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module (assoc-ref py:%standard-phases 'install))) + #:tests? #~(not (%current-target-system)) #:cargo-inputs `(("rust-ahash" ,rust-ahash-0.8) ("rust-arrayvec" ,rust-arrayvec-0.7) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d1a5da66d9..c98bd86ada 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -99,7 +99,8 @@ (base32 "1mhrl4j5r6wzsnwpqsbgzny5vqschyjm3gnk4y88har7skk7j19v")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-configparser" ,rust-configparser-2) ("rust-env-logger" ,rust-env-logger-0.8) ("rust-getopts" ,rust-getopts-0.2) @@ -138,7 +139,8 @@ low-end hardware and serving many concurrent requests.") (base32 "1kgzz92mkyzn7mbsdpik1q21kl38i4almn01k99nww3p0vgx9514")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags + `(#:tests? ,(not (%current-target-system)) + #:cargo-test-flags '("--release" "--" "--skip=dns::client::tests::test_tcp_client" "--skip=dns::client::tests::test_udp_client") @@ -211,7 +213,8 @@ alternative zones.") (base32 "05sj0chxpai26fhk1k7p5m54v3j7n1x64ayx53mcimsj1skdr77m")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-ansi-colours" ,rust-ansi-colours-1) ("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) @@ -273,7 +276,8 @@ paging.") (base32 "1b0mz1ki2ksxni6g49x5l5j9ijpyhc11mywvxr9i9h3nr098nc5l")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f ;; https://github.com/mookid/diffr/issues/79 #:cargo-test-flags '("--release" "--" @@ -313,7 +317,8 @@ highlighting tool to ease code review from your terminal.") (base32 "1m73d7rzi0p5c1hn0081d2235kcyapdza7h0vqf5jhnirpnjn793")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) ("rust-clap" ,rust-clap-2) ("rust-colored" ,rust-colored-1) @@ -354,7 +359,8 @@ Ansible syntax. Benchmark files can be written in YAML.") (base32 "1611h27i8fm3jndscd6w65z8z7w09nnrm61vdgs9kb8ln57gqm8x")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f #:cargo-inputs (("rust-getopts" ,rust-getopts-0.2) ("rust-regex" ,rust-regex-1) @@ -392,7 +398,8 @@ Features include: "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-datetime" ,rust-datetime-0.5) @@ -478,7 +485,8 @@ also knows about symlinks, extended attributes, and Git.") "186217yyb0znfn4jcc9l3i51fhfyb23lhbm3gg084sdrbj6bdnbg")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags + `(#:tests? ,(not (%current-target-system)) + #:cargo-test-flags '("--release" "--" ;; No user 'root' in the build environment. @@ -569,7 +577,8 @@ provides defaults for 80% of the use cases.") "0sipag77196467idbznbk5q5lwhqz85zw7y1pwg9b27jxqyk04rp")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-2) @@ -600,6 +609,7 @@ characters, ASCII whitespace characters, other ASCII characters and non-ASCII.") `(#:modules ((guix build cargo-build-system) (guix build utils) (srfi srfi-26)) + #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-cfg-if" ,rust-cfg-if-0.1) @@ -659,6 +669,7 @@ characters, ASCII whitespace characters, other ASCII characters and non-ASCII.") (build-system cargo-build-system) (arguments `(#:features '("pulseaudio" "libpulse-binding") + #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -751,7 +762,8 @@ bar. It is also compatible with sway.") (base32 "0kafd87zmjf7wswyiqakqd2r5b8q3a761ipsihmrg9wr57k5zlis")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags + `(#:tests? ,(not (%current-target-system)) + #:cargo-test-flags '("--release" "--" "--skip=functions::env_var_functions" "--skip=string::shebang_backtick") @@ -855,6 +867,7 @@ bar. It is also compatible with sway.") #:imported-modules ((guix build cargo-build-system) (guix build cargo-utils) ,@%pyproject-build-system-modules) + #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-test-flags '("--release" "--" @@ -1012,7 +1025,8 @@ bar. It is also compatible with sway.") "1gv4imhjgxmyxaa996yshcjlakmrjw9pf4rycp90pq675cn9sz7k")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-bstr" ,rust-bstr-0.2) ("rust-clap" ,rust-clap-2) ("rust-grep" ,rust-grep-0.2) @@ -1069,7 +1083,8 @@ gitignore rules.") "1m5kzpqq9pgc19lbnh20iaq654lzlmc1m5fc9f73w2vpwqdiw1qf")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-clap" ,rust-clap-2) + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-glob" ,rust-glob-0.3) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) @@ -1102,7 +1117,8 @@ touchscreen devices.") (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f #:cargo-build-flags '("--release" "-p" "swc_cli") #:cargo-test-flags @@ -1237,7 +1253,8 @@ browsers.") "19wfjz7z4kqjfjmnq1bl6dhsvskjy6r656fqmbha9dfdspbsnmd0")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f ;; error[E0463]: can't find crate for `cargo_test_macro` #:tests? #f #:cargo-inputs @@ -1310,7 +1327,8 @@ by modifying your @file{Cargo.toml} file from the command line.") "173spqqpyc00kvfmldjmjfqizh9b4spq4xw4bskd4dny8qcpz28d")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags + `(#:tests? ,(not (%current-target-system)) + #:cargo-test-flags ;; https://github.com/MitMaro/git-interactive-rebase-tool/issues/586 '("--release" "--" "--skip=tests::success") #:cargo-inputs @@ -1354,7 +1372,8 @@ rebase.") "0673pq96hs7waavkv58v2pakpxpsfyjvbraa5kyl2b44phgdzcid")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("clap" ,rust-clap-2) ("log" ,rust-log-0.4) ("proc-macro2" ,rust-proc-macro2-1) @@ -1383,7 +1402,8 @@ rebase.") (base32 "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-clap" ,rust-clap-3) ("rust-heck" ,rust-heck-0.4) ("rust-indexmap" ,rust-indexmap-1) @@ -1428,7 +1448,8 @@ rebase.") (base32 "1yld9fni9g9mzg4r42zfk79aq9mzm2sfzzjrrx4vir4lp4qqqwiq")))) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-heck" ,rust-heck-0.3) ("rust-indexmap" ,rust-indexmap-1) @@ -1489,7 +1510,8 @@ rebase.") "038wcjiiay825wc8inmn62flklc1adxskg5fmjhmxqnhwmj1k5gn")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-anyhow" ,rust-anyhow-1) ("rust-atty" ,rust-atty-0.2) @@ -1543,7 +1565,8 @@ of the project is to be runnable on untrusted networks without crashing.") (base32 "1q4mz2c32gfypx33zlzgd1q9h4322jrk13fzvsf8h676ylclqzpc")))) (build-system cargo-build-system) (arguments - `(#:cargo-build-flags '("--release" "--features" "external-harfbuzz") + `(#:tests? ,(not (%current-target-system)) + #:cargo-build-flags '("--release" "--features" "external-harfbuzz") #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-byte-unit" ,rust-byte-unit-4) @@ -1625,7 +1648,8 @@ of support files.") (base32 "1rarg6rffzl1cf6r167h9p14wr696kwnzr85kwbdy7x7x5zpj5li")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-console" ,rust-console-0.13) @@ -1683,7 +1707,8 @@ revert and check changes. (base32 "03x27nixdlnkkrh85gy4152arp02kpjwq0i9dn9p73lyr24s64lv")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-2) @@ -1710,7 +1735,8 @@ colorized view to stdout.") (base32 "000w549v1bpw7r57xw656p40ywf1gimvxxx5cjnri2js0xg927x4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-clap" ,rust-clap-2) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) @@ -1763,7 +1789,8 @@ blanks grouped by language.") (base32 "01fds6dm19bqgqydaa6n051v9l4wh9rb5d6sr9akwp2cc0fs43b7")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-ansi-colours" ,rust-ansi-colours-1) ("rust-clap" ,rust-clap-2) ("rust-dirs" ,rust-dirs-3) @@ -1811,6 +1838,7 @@ older terminal emulators.") ;; ;; (copy-file "completions/zsh" zsh) (install-file "README.md" doc))))) + #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-embed-resource" ,rust-embed-resource-1) @@ -1853,6 +1881,7 @@ runs a command whenever it detects modifications.") (substitute* "Cargo.toml" (("version = \"1.4\"") "version = \"^1\""))))) + #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-aes" ,rust-aes-0.7) ("rust-anyhow" ,rust-anyhow-1) @@ -1925,6 +1954,7 @@ background agent taking care of maintaining the necessary state.") (build-system cargo-build-system) (arguments `(#:rust ,rust-1.64 + #:tests? ,(not (%current-target-system)) #:install-source? #f ; virtual manifest #:cargo-test-flags '("--release" "--lib" "--tests" "--" @@ -2101,7 +2131,8 @@ support for Rust.") "191d0813g4m2g1c1h8ykgrfp00blkbds6pg3zl044iyxaclng29h")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cargo" ,rust-cargo-0.69) ("rust-cargo-util" ,rust-cargo-util-0.2) @@ -2142,7 +2173,8 @@ C-compatible) software.") (base32 "1r1b6fynkjnpj5p3k209sa13mjvh4k0ghzwnribm48dh9v7lfnnv")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-memchr" ,rust-memchr-2)))) (home-page "https://github.com/Freaky/rtss") @@ -2166,7 +2198,8 @@ consecutive lines and since program start.") "1d5v9vq8frkdjm7bnw3455h6xf3c277d51il2qasn7r20kwik7ab")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-atty-0.2" ,rust-atty-0.2) ("rust-beef" ,rust-beef-0.5) ("rust-bitflags" ,rust-bitflags-1) @@ -2251,7 +2284,8 @@ consecutive lines and since program start.") (base32 "1yiyd6fml5hd2l811sckkzmiiq9bd7018ajk4qk3ai4wyvqnw8mv")))) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-2) @@ -2288,7 +2322,8 @@ consecutive lines and since program start.") "0q8slfgjfhpljzlk2myb0i538mfq99q1ljn398jm17r1q2pjjxhv")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cast" ,rust-cast-0.2) ("rust-clap" ,rust-clap-2) @@ -2322,7 +2357,8 @@ files.") (base32 "0x172ffj0lfmbv5nix708l1mfsizxzy74gpxp5amvx0bbaq0p78s")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-exitcode" ,rust-exitcode-1) ("rust-swayipc" ,rust-swayipc-2)))) (home-page "https://github.com/NomisIV/swayhide/") @@ -2405,6 +2441,7 @@ daemon which executes them.") (string-append fish "tealdeer.fish")) (copy-file "completion/zsh_tealdeer" (string-append zsh "_tealdeer")))))) + #:tests? #~(not (%current-target-system)) #:install-source? #f #:cargo-test-flags '("--release" "--" @@ -2466,7 +2503,8 @@ Full featured offline client with caching support.") (base32 "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-clap" ,rust-clap-2) ("rust-git2" ,rust-git2-0.13) @@ -2550,7 +2588,8 @@ It will then write @code{fixup!} commits for each of those changes.") (base32 "0y5v2vgl9f3n0n0w4b3iddbfyxv0hls0vw5406ry0hcvnnjyy2l3")))) (build-system cargo-build-system) (arguments - (list #:cargo-inputs + (list #:tests? #~(not (%current-target-system)) + #:cargo-inputs `(("rust-anyhow" ,rust-anyhow-1) ("rust-askama" ,rust-askama-0.11) ("rust-bincode" ,rust-bincode-1) @@ -2609,7 +2648,8 @@ to navigate to the best match.") (base32 "0912cdkz5xji1hzfj1cf42zh1kd860b52xmwwhb7q2jhp6qk25jh")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-html5ever" ,rust-html5ever-0.25) ("rust-kuchiki" ,rust-kuchiki-0.8) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 6d6733c055..500116c14f 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -515,7 +515,8 @@ This Guix package is built to use the nettle cryptographic library.") (native-inputs (list clang pkg-config)) (arguments - `(#:install-source? #f + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-chrono" ,rust-chrono-0.4) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 5a9d5ed480..7d73ba4a1c 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -252,6 +252,7 @@ cards.") `(#:modules ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) + #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 989fd00e61..56803886e3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1524,7 +1524,8 @@ basic input/output.") (base32 "1jbyxnza38c22k7ri8apzn03q91l06isj8la9xca7cz06kn0hha9")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f ; virtual manifest + `(#:tests? ,(not (%current-target-system)) + #:install-source? #f ; virtual manifest #:cargo-inputs (("rust-alacritty-config" ,rust-alacritty-config-0.1) ("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.2) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f5714e934a..1fca31b395 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -226,7 +226,8 @@ competitive (as in keystroke count) with Vim.") (sha256 "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8"))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-clap" ,rust-clap-2) ("rust-daemonize" ,rust-daemonize-0.4) @@ -271,7 +272,8 @@ Rust.") (file-name (git-file-name name version)))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-getopts" ,rust-getopts-0.2) ("rust-libc" ,rust-libc-0.2) ("rust-emacs" ,rust-emacs-0.11) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 009f2edeef..3b3a99c8c8 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -164,6 +164,7 @@ This package includes the @code{libtree-sitter} runtime library.") (list tree-sitter graphviz node-lts)) (arguments (list + #:tests? #~(not (%current-target-system)) #:cargo-test-flags ''("--release" "--" ;; Skip tests which rely on downloading grammar fixtures. It is diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b4dd7c27ae..3524aed9b2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5356,7 +5356,8 @@ result in several formats: (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-aom-sys" ,rust-aom-sys-0.3) ("rust-arbitrary" ,rust-arbitrary-0.4) ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b46286c690..ea144fb8c1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -460,7 +460,8 @@ replacing them with data URIs.") (base32 "1pj4wnsw5a4ys79sqw68ib6zimaqlkplb89x6yncg949a6hj8516")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-base64" ,rust-base64-0.13) ("rust-chrono" ,rust-chrono-0.4) @@ -1477,7 +1478,7 @@ efficiently. It gives the application developer no more than 4 methods.") "ImportTaxonomy" "ImportText" "ImportXML")) - (for-each + (for-each (lambda (directory) (copy-recursively directory (string-append perl "/../" directory))) @@ -6866,7 +6867,8 @@ file links.") (base32 "1l72r6a917ymc9pn8dllbal1xdczfai376nvqkiys5fm4j4s3zmj")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? ,(not (%current-target-system)) + #:cargo-inputs (("rust-ansi-parser" ,rust-ansi-parser-0.6) ("rust-dirs" ,rust-dirs-2) ("rust-gdk" ,rust-gdk-0.13) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 912400a191..5d0800750e 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -75,7 +75,7 @@ to NAME and VERSION." (define* (cargo-build name inputs #:key source - (tests? #t) + (tests? #f) (test-target #f) (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) -- cgit v1.2.3 From 670f74699e634cf192144fdb731fe38942c40b9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 13:47:53 +0300 Subject: gnu: rust-base32-0.4: Add missing inputs. * gnu/packages/crates-io.scm (rust-base32-0.4) [cargo-development-inputs]: Add rust-quickcheck-0.7, rust-rand-0.5. --- gnu/packages/crates-io.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 88b0d24b69..3c3558da4f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6633,6 +6633,10 @@ embedded-friendly no_std support.") (base32 "1ykwx8jhksqxghfgyw2pzikzjf4n9wqm1x2ww5wqyn68ssf6dki3")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.7) + ("rust-rand" ,rust-rand-0.5)))) (home-page "https://github.com/andreasots/base32") (synopsis "Base32 encoder/decoder for Rust") (description "This library lets you encode and decode in either -- cgit v1.2.3 From 73c462d6c4d217158c044173b07e70587a0ca103 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 14:44:33 +0300 Subject: gnu: rust-cargo-util-0.1: Fix build. * gnu/packages/crates-io.scm (rust-cargo-util-0.1) [cargo-inputs]: Add rust-anyhow-1, rust-core-foundation-0.9, rust-crypto-hash-0.3, rust-filetime-0.2, rust-hex-0.4, rust-jobserver-0.1, rust-libc-0.2, rust-log-0.4, rust-miow-0.3, rust-same-file-1, rust-shell-escape-0.1, rust-tempfile-3, rust-walkdir-2, rust-winapi-0.3. [inputs]: Inherit from cargo-util-0.2. [native-inputs]: Inherit from cargo-util-0.2. --- gnu/packages/crates-io.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3c3558da4f..75e1dc7919 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11302,9 +11302,22 @@ supported by Cargo.") (sha256 (base32 "1sz0gzcyp9ycb4zwj69qs9gd8kn9hv9nh2dq42c59x5xccqph755")))) - (arguments '()) - (inputs '()) - (native-inputs '()))) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-crypto-hash" ,rust-crypto-hash-0.3) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-hex" ,rust-hex-0.4) + ("rust-jobserver" ,rust-jobserver-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-miow" ,rust-miow-0.3) + ("rust-same-file" ,rust-same-file-1) + ("rust-shell-escape" ,rust-shell-escape-0.1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-cassowary-0.3 (package -- cgit v1.2.3 From 142be165e02c43aa10ccdece645c6e3996209a1e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 15:21:56 +0300 Subject: gnu: rust-ravif-0.6: Update to 0.6.6. * gnu/packages/crates-graphics.scm (rust-ravif-0.6): Update to 0.6.6. [arguments]: Skip build. --- gnu/packages/crates-graphics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 5d5319a387..aa899600be 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2186,21 +2186,22 @@ AVIF format (powers the `cavif` tool).") (package (inherit rust-ravif-0.8) (name "rust-ravif") - (version "0.6.4") + (version "0.6.6") (source (origin (method url-fetch) (uri (crate-uri "ravif" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gyc7w1fz3qdk95cdpkj185dm6lskxfp329xm69waxc565fcz9rx")))) + (base32 "0rfm63bv0q2rjyivmzlk4wma8xff6jralh7dr1bjz2aw4knm7cw1")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Not packaging older versions of rav1e. + #:cargo-inputs (("rust-avif-serialize" ,rust-avif-serialize-0.6) ("rust-imgref" ,rust-imgref-1) ("rust-loop9" ,rust-loop9-0.1) ("rust-num-cpus" ,rust-num-cpus-1) - ("rav1e" ,rav1e) + ("rav1e" ,rav1e) ; 0.5 ("rust-rayon" ,rust-rayon-1) ("rust-rgb" ,rust-rgb-0.8)) #:cargo-development-inputs -- cgit v1.2.3 From 2b36ee84ee52a8f4802518250b6a969d09db9bb3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 15:33:30 +0300 Subject: gnu: rust-core-foundation-sys-0.7: Downgrade to 0.7.0. Later versions of this crate are yanked upstream. * gnu/packages/crates-io.scm (rust-core-foundation-sys-0.7): Downgrade to 0.7.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 75e1dc7919..faa78f6f36 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15668,14 +15668,14 @@ intrinsics.") (package (inherit rust-core-foundation-sys-0.8) (name "rust-core-foundation-sys") - (version "0.7.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (crate-uri "core-foundation-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ghrg46h4ci306agr2vwm28w6gb5l455nzp61y2zkhwfs49p4nis")))))) + (base32 "1b5qfnnmg49sawwfsb0c0wbj81bqi7h7lh68pmhbidf0jjs1m9xk")))))) (define-public rust-core-foundation-sys-0.6 (package -- cgit v1.2.3 From 9bbf7d5937bea09a804717feb4afa4e5f29608b1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 15:41:10 +0300 Subject: gnu: rust-proc-macro2-1.0.34: Fix inputs. * gnu/packages/crates-io.scm (rust-proc-macro2-1.0.34) [cargo-inputs]: Remove rust-unicode-ident-1. Add rust-unicode-xid-0.2. [cargo-development-inputs]: Replace rust-quote-1.0.10 with 1. Remove rust-rustversion-1. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index faa78f6f36..1a938275d6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -51442,10 +51442,9 @@ in terms of the upstream unstable API.") (arguments `(#:cargo-test-flags '("--lib") #:cargo-inputs - (("rust-unicode-ident" ,rust-unicode-ident-1)) + (("rust-unicode-xid" ,rust-unicode-xid-0.2)) #:cargo-development-inputs - (("rust-quote" ,rust-quote-1.0.10) - ("rust-rustversion" ,rust-rustversion-1)))))) + (("rust-quote" ,rust-quote-1)))))) (define-public rust-proc-macro2-0.4 (package -- cgit v1.2.3 From 13d8080f21859cac0f020958935885a5795b9367 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 15:54:57 +0300 Subject: gnu: rust-pcap-sys-0.1: Remove bundled libraries. * gnu/packages/crates-io.scm (rust-pcap-sys-0.1)[source]: Add snippet to remove bundled libraries. --- gnu/packages/crates-io.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a938275d6..1bae40ac5c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48023,11 +48023,12 @@ in pure Rust.") (origin (method url-fetch) (uri (crate-uri "pcap-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "18w9c8i5zjnazay86219w4789482ya617z35cw433h12wbgjaiqi")))) + (base32 "18w9c8i5zjnazay86219w4789482ya617z35cw433h12wbgjaiqi")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "Lib"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From cd9b8010798d9984339fad410e54a677cb19379c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 16:00:59 +0300 Subject: gnu: rust-merge-0.1: Add missing inputs. * gnu/packages/crates-io.scm (rust-merge-0.1)[cargo-development-inputs]: Add rust-env-0.4, rust-serde-1, rust-structopt-0.3, rust-toml-0.5, rust-trybuild-1. --- gnu/packages/crates-io.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1bae40ac5c..c059db2b4c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39590,7 +39590,13 @@ for Rust structs.") (arguments `(#:cargo-inputs (("rust-merge-derive" ,rust-merge-derive-0.1) - ("rust-num-traits" ,rust-num-traits-0.2)))) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-envy" ,rust-envy-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-toml" ,rust-toml-0.5) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://sr.ht/~ireas/merge-rs") (synopsis "Rust trait for objects that can be merged") (description "This package provides a merge trait that can be used -- cgit v1.2.3 From 6371e3db1316fd8b52eaac7d7af08022592a8363 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 16:05:38 +0300 Subject: gnu: rust-merge-derive-0.1: Add missing inputs. * gnu/packages/crates-io.scm (rust-merge-drive-0.1)[cargo-inputs]: Add rust-proc-macro-error-1, rust-proc-macro2-1, rust-quote-1, rust-syn-1. --- gnu/packages/crates-io.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c059db2b4c..a23a09803f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39568,6 +39568,12 @@ for Rust structs.") (sha256 (base32 "01wxhi7mqmp34l540wcfb24hb13vcbps4wlynas66bnsfra0g790")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) (home-page "https://sr.ht/~ireas/merge-rs") (synopsis "Derive macro for the merge crate") (description "This crate provides a derive macro for the -- cgit v1.2.3 From 0b691ce66e888431e6a5cd710d729ab05872145d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 16:21:34 +0300 Subject: gnu: rust-quinn-proto-0.8: Add missing input. * gnu/packages/crates-io.scm (rust-quinn-proto-0.8)[native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a23a09803f..630d861b5f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53603,6 +53603,8 @@ and Petrick's method, an algorithm to automatically minimize boolean expressions ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rcgen" ,rust-rcgen-0.8) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (native-inputs + (list perl)) (home-page "https://github.com/quinn-rs/quinn") (synopsis "State machine for the QUIC transport protocol") (description "State machine for the QUIC transport protocol") -- cgit v1.2.3 From b896ecd2114ab89ec94f6e81f75f6e331cb3589a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 16:30:00 +0300 Subject: gnu: rust-rustls-native-certs-0.4: Add missing input. * gnu/packages/crates-io.scm (rust-rustls-native-certs-0.4) [native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 630d861b5f..bdb0560631 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59179,7 +59179,8 @@ native certificate store.") (("rust-ring" ,rust-ring-0.16) ("rust-untrusted" ,rust-untrusted-0.7) ("rust-webpki" ,rust-webpki-0.21) - ("rust-webpki-roots" ,rust-webpki-roots-0.20)))))) + ("rust-webpki-roots" ,rust-webpki-roots-0.20)))) + (native-inputs (list perl)))) (define-public rust-rustls-pemfile-1 (package -- cgit v1.2.3 From 96cfc096deda1c0d3da0f176958cae143f8929f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 16:43:13 +0300 Subject: gnu: rust-derive-error-chain-0.10: Fix inputs. * gnu/packages/crates-io.scm (rust-derive-error-chain-0.10) [cargo-inputs]: Replace rust-syn-0.14 with 0.11. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bdb0560631..f80aef8730 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20312,7 +20312,7 @@ pattern for arbitrary structs.") (arguments `(#:cargo-inputs (("rust-quote" ,rust-quote-0.3) - ("rust-syn" ,rust-syn-0.14)))) + ("rust-syn" ,rust-syn-0.11)))) (home-page "https://github.com/Arnavion/derive-error-chain") (synopsis "Macros 1.1 implementation of error-chain") (description "This package provides a Macros 1.1 implementation of -- cgit v1.2.3 From b4d3877fe8e14a6b6c14114b22d552b114e0132f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 19:56:59 +0300 Subject: gnu: rust-enquote-1: Add missing input. * gnu/packages/crates-io.scm (rust-enquote-1)[cargo-inputs]: Add rust-thiserror-1. --- gnu/packages/crates-io.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f80aef8730..47ec0aa0bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23109,6 +23109,8 @@ order.") (base32 "0clrjghlfkkb7sndabs5wch0fz2nif6nj4b117s8kqxx3nqnrhq6")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/reujab/enquote") (synopsis "Rust library that quotes, unquotes, and unescapes strings") (description "This package provides a Rust library quotes, unquotes, and -- cgit v1.2.3 From 5fcd7836d65d416cc08c9f4003197a77a004631d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Oct 2023 20:02:37 +0300 Subject: gnu: rust-fat-macho-0.4: Remove precompiled files. * gnu/packages/crates-io.scm (rust-fat-macho-0.4)[source]: Add snippet to remove precompiled files. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 47ec0aa0bf..79490eb18f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24687,7 +24687,10 @@ floats.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3")))) + "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "tests/fixtures"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 662dc259045ca73feaabcac3a5a206d1f4c87ccf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:16:03 +0300 Subject: gnu: rust-glutin-egl-sys-0.1: Update to 0.1.6. * gnu/packages/crates-graphics.scm (rust-glutin-egl-sys-0.1): Update to 0.1.6. [cargo-inputs]: Replace rust-gl-generator-0.13 with 0.14. --- gnu/packages/crates-graphics.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index aa899600be..10585ddea4 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1217,20 +1217,18 @@ EUI-64, also known as MAC-48 media access control addresses.") (package (inherit rust-glutin-egl-sys-0.4) (name "rust-glutin-egl-sys") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (crate-uri "glutin-egl-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra")))) + (base32 "0g81bz7ppvaksvwcw1jg553g8b2shvmnfm9ms6hixwvinj20z438")))) (arguments `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3) - ("rust-gl-generator" ,rust-gl-generator-0.13)))))) + ("rust-gl-generator" ,rust-gl-generator-0.14)))))) (define-public rust-glutin-emscripten-sys-0.1 (package -- cgit v1.2.3 From 8e50e1ff9a95e85797bda9b0b63a2974f7c1b3f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:16:40 +0300 Subject: gnu: rust-mp4parse-0.12: Update to 0.12.1. * gnu/packages/crates-graphics.scm (rust-mp4parse-0.12): Update to 0.12.1. --- gnu/packages/crates-graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 10585ddea4..87fb4bfe08 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1740,13 +1740,13 @@ graphics and video games.") (define-public rust-mp4parse-0.12 (package (name "rust-mp4parse") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (crate-uri "mp4parse" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ppqv60qiyrnbb996gb1sik08c0j2i317llv3rrcwb1cjg3bdlk7")))) + (base32 "1scynvlmiy6xv2rrzzpijd812amh6a863na8i0xrcw5d9d08kl8h")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. -- cgit v1.2.3 From 287e0315381b82bb04ba04f6beabe2687d063291 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:17:12 +0300 Subject: gnu: rust-glib-macros-0.15: Update to 0.15.13. * gnu/packages/crates-gtk.scm (rust-glib-macros-0.15): Update to 0.15.13. --- gnu/packages/crates-gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index e816c5ee41..3c6f833145 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1395,14 +1395,14 @@ (package (inherit rust-glib-macros-0.17) (name "rust-glib-macros") - (version "0.15.11") + (version "0.15.13") (source (origin (method url-fetch) (uri (crate-uri "glib-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5")))) + (base32 "0jiwvywmkqhih6glipj1c7aylwfr738jid8nmjr4yvx2dygsxihh")))) (arguments `(;; XXX: Circular dependency on rust-glib?? #:tests? #f -- cgit v1.2.3 From e2ed4b9b237f8aa0d390bdafc8fff5a97ac3554b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:17:41 +0300 Subject: gnu: Add rust-core2-0.4. * gnu/packages/crates-io.scm (rust-core2-0.4): New variable. (rust-core2-0.3): Inherit from rust-core2-0.4. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 79490eb18f..2551c99474 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15385,19 +15385,20 @@ numbers using the CORDIC method.") (description "Implementation detail of the @code{core_extensions} crate.") (license (list license:expat license:asl2.0)))) -(define-public rust-core2-0.3 +(define-public rust-core2-0.4 (package (name "rust-core2") - (version "0.3.3") + (version "0.4.0") (source - (origin - (method url-fetch) - (uri (crate-uri "core2" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1wzzy5iazdk5caadxvjfwrd312rbg7a55a1zpmsdrhk3kfpa77r3")))) + (origin + (method url-fetch) + (uri (crate-uri "core2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01f5xv0kf3ds3xm7byg78hycbanb8zlpvsfv4j47y46n3bpsg6xl")))) (build-system cargo-build-system) - (arguments `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)))) + (arguments + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)))) (home-page "https://github.com/bbqsrc/core2") (synopsis "Bare essentials of @code{std::io} for use in @code{no_std}") (description @@ -15405,6 +15406,20 @@ numbers using the CORDIC method.") in @code{no_std}. Alloc support is optional.") (license (list license:asl2.0 license:expat)))) +(define-public rust-core2-0.3 + (package + (inherit rust-core2-0.4) + (name "rust-core2") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wzzy5iazdk5caadxvjfwrd312rbg7a55a1zpmsdrhk3kfpa77r3")))) + (arguments `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)))))) + (define-public rust-cookie-store-0.19 (package (name "rust-cookie-store") -- cgit v1.2.3 From 2327185bb01b171ae46e614d80a38c911878b384 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:18:06 +0300 Subject: gnu: rust-hyper-rustls-0.23: Add missing input. * gnu/packages/crates-io.scm (rust-hyper-rustls-0.23)[native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2551c99474..adc66c6c2f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32096,6 +32096,7 @@ SystemTime}}.") ("rust-rustls" ,rust-rustls-0.20) ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list perl)) (home-page "https://github.com/ctz/hyper-rustls") (synopsis "Rustls+Hyper integration for pure Rust HTTPS") (description -- cgit v1.2.3 From 2294cb6bf42c3c3abc14e41979c92841474accd0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:18:33 +0300 Subject: gnu: rust-libflate-lz77-1: Update to 1.2.0. * gnu/packages/crates-io.scm (rust-libflate-lz77-1): Update to 1.2.0. [cargo-inputs]: Add rust-core2-0.4, rust-hashbrown-0.13. [cargo-development-inputs]: Replace rust-libflate-0.1 with 1. --- gnu/packages/crates-io.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index adc66c6c2f..dfc1da7643 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36117,20 +36117,22 @@ algorithm and related formats (ZLIB, GZIP).") (define-public rust-libflate-lz77-1 (package (name "rust-libflate-lz77") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "libflate_lz77" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nig3z2wjwk27ia066knp633akm00v017vny976sy29l970399rr")))) + (base32 "1gxc75fb2sk0xgrh3qxvxcx1l93yhmyxn9241r251wl5zj5klbd5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-rle-decode-fast" ,rust-rle-decode-fast-1)) + (("rust-core2" ,rust-core2-0.4) + ("rust-hashbrown" ,rust-hashbrown-0.13) + ("rust-rle-decode-fast" ,rust-rle-decode-fast-1)) #:cargo-development-inputs - (("rust-libflate" ,rust-libflate-0.1)))) + (("rust-libflate" ,rust-libflate-1)))) (home-page "https://github.com/sile/libflate") (synopsis "LZ77 encoder for libflate crate") (description "This package provides a LZ77 encoder for libflate crate.") -- cgit v1.2.3 From a6f39f1d68e8e72479726ea2157bef44501f4a85 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:19:26 +0300 Subject: gnu: rust-matrixmultiply-0.3: Update to 0.3.8. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.3): Update to 0.3.8. [arguments]: Don't skip build. [cargo-inputs]: Add rust-autocfg-1. [cargo-development-inputs]: Add rust-bencher-0.1, rust-itertools-0.8. --- gnu/packages/crates-io.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dfc1da7643..a6ac111125 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38865,22 +38865,25 @@ testing of matrixcompare.") (define-public rust-matrixmultiply-0.3 (package (name "rust-matrixmultiply") - (version "0.3.1") + (version "0.3.8") (source (origin (method url-fetch) (uri (crate-uri "matrixmultiply" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hdpsvw28in1m9c5h8a7abzxv70rq8l5hg5h8k6sxpyrfsvib2js")))) + (base32 "1whgrp8ph7904aslqx87h9qm0ks4pxdj2nysffmrhiys6v7w2x3m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-num-cpus" ,rust-num-cpus-1) + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-once-cell" ,rust-once-cell-1) ("rust-rawpointer" ,rust-rawpointer-0.2) - ("rust-thread-tree" ,rust-thread-tree-0.3)))) + ("rust-thread-tree" ,rust-thread-tree-0.3)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-itertools" ,rust-itertools-0.8)))) (home-page "https://github.com/bluss/matrixmultiply/") (synopsis "General matrix multiplication for f32 and f64 matrices") (description "General matrix multiplication for f32 and f64 matrices. -- cgit v1.2.3 From 340b6f97c56280f1bc409f7386482bdee4f69427 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:41:19 +0300 Subject: gnu: rust-libmimalloc-sys-0.1: Update to 0.1.35. * gnu/packages/crates-io.scm (rust-libmimalloc-sys-0.1): Update to 0.1.35. [source]: Add snippet to override the build.rs file. [cargo-inputs]: Add rust-cc-1, rust-libc-0.2, rust-pkg-config-0.3. Remove rust-cmake-0.1. [native-inputs]: Remove cmake-minimal. [inputs]: Add mimalloc. --- gnu/packages/crates-io.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a6ac111125..9021adf5c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36478,7 +36478,7 @@ functions and static variables these libraries contain.") (define-public rust-libmimalloc-sys-0.1 (package (name "rust-libmimalloc-sys") - (version "0.1.18") + (version "0.1.35") (source (origin (method url-fetch) @@ -36486,17 +36486,28 @@ functions and static variables these libraries contain.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bbm03687j9fspvk6nqspmjlvchlvbxydl0mrc1x9i1k6kqiy5c2")) + "0r4nrd9xbmhmipw4bvh4xlbzbc7xf74frrsibqglysffgv1vay9r")) (modules '((guix build utils))) (snippet - '(begin (delete-file-recursively "c_src/mimalloc/bin"))))) + '(begin (substitute* "Cargo.toml" + (("\\[build-dependencies\\.cc\\]" all) + (string-append "[build-dependencies.pkg-config]\n" + "version = \"0.3\"\n\n" + all))) + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=mimalloc\");~@ + }~%"))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cty" ,rust-cty-0.2) - ("rust-cmake" ,rust-cmake-0.1)))) - (native-inputs - `(("cmake" ,cmake-minimal))) + (("rust-cc" ,rust-cc-1) + ("rust-cty" ,rust-cty-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs (list mimalloc)) (home-page "https://github.com/purpleprotocol/mimalloc_rust") (synopsis "Sys crate wrapping the mimalloc allocator") (description "This package provides a sys crate wrapping the mimalloc -- cgit v1.2.3 From c701592f20beec9a5c1edc19a2bbb11ab19e6a4c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 09:43:02 +0300 Subject: gnu: rust-mimalloc-0.1: Update to 0.1.39. * gnu/packages/crates-io.scm (rust-mimalloc-0.1): Update to 0.1.39. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9021adf5c2..3d2c44e69f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39971,7 +39971,7 @@ embedded migrations.") (define-public rust-mimalloc-0.1 (package (name "rust-mimalloc") - (version "0.1.20") + (version "0.1.39") (source (origin (method url-fetch) @@ -39979,7 +39979,7 @@ embedded migrations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0x74b6jv6pxfl6bh44bnch6ajm3l5z3zq8w8mqlscbq8d77rnx80")))) + "176w9gf5qxs07kd2q39f0k25rzmp4kyx5r13wc8sk052bqmr40gs")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From da11f16ead65439f944c65aff714949e8368ed01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 10:31:49 +0300 Subject: gnu: rust-napi-0.5: Skip build. * gnu/packages/crates-io.scm (rust-napi-0.5)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3d2c44e69f..f1f897b16e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41520,7 +41520,8 @@ linear algebra library.") (base32 "0mp0di7zv1r9gn3r3pmqnyy6q94akd9d6bl1p7m76nm9hgj9rw56")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Wants node for napi-build-0.2 and napi-sys-0.4 + #:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-futures" ,rust-futures-0.3) ("rust-napi-sys" ,rust-napi-sys-0.4) -- cgit v1.2.3 From 05de88413b9a6765ca3bdb4b301eec08f2b30619 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 10:32:16 +0300 Subject: gnu: rust-napi-sys-0.4: Skip build. * gnu/packages/crates-io.scm (rust-napi-sys-0.4)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f1f897b16e..3ac47a8531 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41680,7 +41680,8 @@ linear algebra library.") (native-inputs (list pkg-config)) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Wants node. + #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.55) ("rust-semver" ,rust-semver-0.10) ("rust-tar" ,rust-tar-0.4)) -- cgit v1.2.3 From c3530fd66195091201cd41b4a917de1bc6145c63 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 10:47:23 +0300 Subject: gnu: Add rust-nitrokey-test-0.3. * gnu/packages/crates-io.scm (rust-nitrokey-test-0.3): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ac47a8531..ffc49abc96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42695,6 +42695,27 @@ communication with Nitrokey devices.") nitrokey crate and others using it.") (license license:gpl3+))) +(define-public rust-nitrokey-test-0.3 + (package + (inherit rust-nitrokey-test-0.5) + (name "rust-nitrokey-test") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "nitrokey-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dzy0lfz2zwn7f1d126avig6risj78a4bvf3zdwjyldaxln0rnpk")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-nitrokey" ,rust-nitrokey-0.9) + ("rust-nitrokey-test-state" ,rust-nitrokey-test-state-0.1)))))) + (define-public rust-nitrokey-test-state-0.1 (package (name "rust-nitrokey-test-state") -- cgit v1.2.3 From 0ad30651bb7fbe1bceb1cdef7525523257928dfd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 10:47:51 +0300 Subject: gnu: rust-nitrokey-0.9: Add missing inputs. * gnu/packages/crates-io.scm (rust-nitrokey-0.9) [cargo-development-inputs]: Add rust-nitrokey-test-0.3, rust-nitrokey-test-suite-0.1. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ffc49abc96..4a4f321dc7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42642,7 +42642,10 @@ applications written in Rust. Its API is inspired by the popular (("rust-lazy_static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-nitrokey-sys" ,rust-nitrokey-sys-3) - ("rust-rand_core" ,rust-rand-core-0.5)))) + ("rust-rand_core" ,rust-rand-core-0.5)) + #:cargo-development-inputs + (("rust-nitrokey-test" ,rust-nitrokey-test-0.3) + ("rust-nitrokey-test-state" ,rust-nitrokey-test-state-0.1)))) (home-page "https://git.sr.ht/~ireas/nitrokey-rs") (synopsis "Rust bindings to libnitrokey") (description -- cgit v1.2.3 From 8b60fb1110248b8c66b75cb3aa1133826095598a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 11:46:36 +0300 Subject: gnu: rust-opener-0.5: Update to 0.5.2. * gnu/packages/crates-io.scm (rust-opener-0.5): Update to 0.5.2. [cargo-inputs]: Add rust-bstr-1. [cargo-development-inputs]: Add rust-version-sync-0.9. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a4f321dc7..4af5193186 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45572,20 +45572,21 @@ the system.") (define-public rust-opener-0.5 (package (name "rust-opener") - (version "0.5.0") + (version "0.5.2") (source (origin (method url-fetch) (uri (crate-uri "opener" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0lkrn4fv1h4m8gmp7ll6x7vjvb6kls2ngwa5cgsh2ix5fb6yp8sf")))) + (base32 "01ghahdn64lw4whj0p70vmzivrdlmca2629gplalq99pirkiag19")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-winapi" ,rust-winapi-0.3)))) + (("rust-bstr" ,rust-bstr-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-version-sync" ,rust-version-sync-0.9)))) (home-page "https://github.com/Seeker14491/opener") (synopsis "Open a file or link using the system default program") (description "This crate provides the ability to open a file or link with -- cgit v1.2.3 From b6a810bbc8e69c19e80270442eba7962e85c3cf7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 11:54:44 +0300 Subject: gnu: rust-os-pipe-0.9: Fix inputs. * gnu/packages/crates-io.scm (rust-os-pipe-0.9)[cargo-inputs]: Add rust-libc-0.2, rust-winapi-0.3. --- gnu/packages/crates-io.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4af5193186..cc2762d8ff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46226,6 +46226,9 @@ easy and usable crypto while trying to minimize the use of unsafe code.") (sha256 (base32 "04yjs1hf88jjm17g8a2lr7ibxyyg460rzbgcw9f1yzihq833y8zv")))) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) (native-inputs (list)))) (define-public rust-os-pipe-0.8 -- cgit v1.2.3 From 3d29965dd9cc43ffc12bd9d2f0bc04c25a9e1d92 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 12:32:35 +0300 Subject: gnu: rust-poly1305-0.7: Allow newer versions of dependencies. * gnu/packages/crates-io.scm (rust-poly1305-0.7)[source]: Add snippet to allow newer versions of dependencies. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc2762d8ff..e3aeb0ef55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50438,7 +50438,11 @@ library.") (uri (crate-uri "poly1305" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pkf4jlriskq9rvz8y5fjj9dw42q6yg5djijlin4n6p1dd3yp2h4")))) + (base32 "1pkf4jlriskq9rvz8y5fjj9dw42q6yg5djijlin4n6p1dd3yp2h4")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("version = \">=1, <1\\.4\"") "version = \"^1\"")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 5e3050d06408421fe95e594f8fc5d1c70522e072 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 13:13:26 +0300 Subject: gnu: rust-quinn-0.8: Add missing input. * gnu/packages/crates-io.scm (rust-quinn-0.8)[native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e3aeb0ef55..bbfe06ed6a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53637,6 +53637,7 @@ and Petrick's method, an algorithm to automatically minimize boolean expressions ("rust-tracing-futures" ,rust-tracing-futures-0.2) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-url" ,rust-url-2)))) + (native-inputs (list perl)) (home-page "https://github.com/quinn-rs/quinn") (synopsis "Versatile QUIC transport protocol implementation") (description "Versatile QUIC transport protocol implementation") -- cgit v1.2.3 From 5d46060db0c1e33b085656b049acbfd35ece10f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 13:14:05 +0300 Subject: gnu: rust-ref-cast-impl-0.2: Fix inputs. * gnu/packages/crates-io.scm (rust-ref-cast-impl-0.2)[cargo-inputs]: Add rust-proc-macro2-1, rust-quote-1, rust-syn-1. --- gnu/packages/crates-io.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bbfe06ed6a..877a956005 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -55490,7 +55490,12 @@ initial value.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0av43xxjlinfqklb67rpj217cmaxfjsf8151gs0hbs4hnr5664ck")))))) + "0av43xxjlinfqklb67rpj217cmaxfjsf8151gs0hbs4hnr5664ck")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-ref-cast-test-suite-0.0.0 (package -- cgit v1.2.3 From 42a142c5de8644d563a4939f06536d6baa98a30c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 13:21:06 +0300 Subject: gnu: rust-riscv-0.7: Remove precompiled libraries. * gnu/packages/crates-io.scm (rust-riscv-0.7)[source]: Add snippet to remove bundled precompiled libraries. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 877a956005..e736199fd5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56516,7 +56516,10 @@ Digital Signature Algorithm} (ECDSA).") (uri (crate-uri "riscv" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fla10m2qkcf7zqw91rrribpdaavkv6qbbzjz9q2n09igbfwq1v9")))) + (base32 "1fla10m2qkcf7zqw91rrribpdaavkv6qbbzjz9q2n09igbfwq1v9")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "bin"))))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 314200b6dae9ce5a7ea21753e97512797d10b393 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 13:25:16 +0300 Subject: gnu: rust-libpijul-0.12: Skip build. * gnu/packages/crates-io.scm (rust-libpijul-0.12)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e736199fd5..1504459729 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36604,7 +36604,8 @@ advertised and discovered using this mechanism.") "18d9n8xaq5ncq3375f0xrr96l8si1frczgzdlrz3fl1jby8vbl6f")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; backend::file_header::test_fileheader_alignment fails + `(#:skip-build? #t ; TODO: Fix build + #:tests? #f ; backend::file_header::test_fileheader_alignment fails #:cargo-inputs (("rust-base64" ,rust-base64-0.10) ("rust-bincode" ,rust-bincode-1) -- cgit v1.2.3 From 94a902954ea7d3722cbc3771894b02360ea4de32 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 13:25:47 +0300 Subject: gnu: rust-ring-0.14: Skip build. * gnu/packages/crates-io.scm (rust-ring-0.14)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1504459729..5334033b51 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56424,7 +56424,8 @@ Digital Signature Algorithm} (ECDSA).") (lambda _ (format #t ""))))))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix build + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-spin" ,rust-spin-0.5) -- cgit v1.2.3 From f581390da5d5c8f9262dc31c714b39e1eeec0e52 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 13:28:08 +0300 Subject: gnu: rust-ring-0.13: Skip build. * gnu/packages/crates-io.scm (rust-ring-0.13)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5334033b51..cd1c43bd0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56470,7 +56470,8 @@ Digital Signature Algorithm} (ECDSA).") (lambda _ (format #t ""))))))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix build + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-untrusted" ,rust-untrusted-0.6) -- cgit v1.2.3 From e1c2520a7bdf54ff36ddb6dfa3078b3fb05cf78b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 14:33:58 +0300 Subject: gnu: rust-sct-0.5: Skip build. * gnu/packages/crates-io.scm (rust-sct-0.5)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cd1c43bd0b..d46e8483fe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60850,7 +60850,8 @@ Pwrite traits from the scroll crate.") (base32 "1fb9ym5bwswx01yyggn7v2vfryih4vnqpp4r4ssv3qaqpn7xynig")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-inputs (("rust-ring" ,rust-ring-0.14) ("rust-untrusted" ,rust-untrusted-0.6)) #:phases -- cgit v1.2.3 From 6f4e7affb2b6a411033c597167b51da2afa93b0a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 14:35:29 +0300 Subject: gnu: rust-sct-0.7: Add missing input. * gnu/packages/crates-io.scm (rust-sct-0.7)[native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d46e8483fe..c2dcd93074 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60811,6 +60811,7 @@ Pwrite traits from the scroll crate.") `(#:cargo-inputs (("rust-ring" ,rust-ring-0.16) ("rust-untrusted" ,rust-untrusted-0.7)))) + (native-inputs (list perl)) (home-page "https://github.com/ctz/sct.rs") (synopsis "Certificate transparency SCT verification library") (description "Certificate transparency SCT verification library.") -- cgit v1.2.3 From f44309053a537f8765bca4fd91c4c34f025a1dd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 14:42:26 +0300 Subject: gnu: rust-security-framework-sys-0.2: Skip build. * gnu/packages/crates-io.scm (rust-security-framework-sys-0.2) [arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2dcd93074..1b8d6b0473 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61327,7 +61327,8 @@ macOS and iOS.") (base32 "07zv0szz2kfy1hn251h0qsq0q9i1zia768d8vzril1g6xarj7mcj")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; MacOS specific + #:cargo-inputs (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) ("rust-libc" ,rust-libc-0.2)))))) -- cgit v1.2.3 From f5adeabdf66248988cd7089e57b734c1cba3ad47 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 15:06:13 +0300 Subject: gnu: rust-serde-repr-0.1: Update to 0.1.16. * gnu/packages/crates-io.scm (rust-serde-repr-0.1): Update to 0.1.16. [cargo-inputs]: Replace rust-proc-macro2-1.0.34 with 1, rust-quote-1.0.10 with 1, rust-syn-1 with 2. [cargo-development-inputs]: Replace rust-serde-json-1.0.73 with 1, rust-trybuild-1.0.19 with 1. --- gnu/packages/crates-io.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b8d6b0473..871fd2e90a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62452,25 +62452,25 @@ commonly used by Ruby on Rails via Rack.") (define-public rust-serde-repr-0.1 (package (name "rust-serde-repr") - (version "0.1.10") + (version "0.1.16") (source (origin (method url-fetch) (uri (crate-uri "serde_repr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0knbzc87nlrfnm1jh3zmx77hxflnzk0xl8xcv7jvn3m2fkxcjpls")))) + (base32 "005x2q9x6cdqp312mjhggbzd6vkg8r0abcg0biz0z9dkmpgy29c7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1.0.34) - ("rust-quote" ,rust-quote-1.0.10) - ("rust-syn" ,rust-syn-1)) + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1.0.73) - ("rust-trybuild" ,rust-trybuild-1.0.19)))) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/serde-repr") (synopsis "Serialize and deserialize C-like enum as underlying repr") (description -- cgit v1.2.3 From 89a770470e644653b809aa4f010a893cfc81faf8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 15:40:11 +0300 Subject: gnu: rust-structopt-0.2: Don't rely on deprecated features. * gnu/packages/crates-io.scm (rust-structopt-0.2)[source]: Add snippet to remove 'lints' feature from dependencies. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 871fd2e90a..d739a20c8b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -67582,7 +67582,11 @@ struct.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn")))) + "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + ((".*lints.*") "")))))) (build-system cargo-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From a568eb2a3adaec625f58d08fa6f2efc0e1dafd55 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 15:52:07 +0300 Subject: gnu: rust-system-deps-6: Remove precompiled library. * gnu/packages/crates-io.scm (rust-system-deps-6)[source]: Add snippet to remove precompiled library. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d739a20c8b..648c4579f5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -69132,7 +69132,9 @@ processors, disks, components and networks.") (uri (crate-uri "system-deps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02g750rlhh7ynqa3p4a3qm7jrkjp3d0jlzrl29z225ch9hf5m951")))) + (base32 "02g750rlhh7ynqa3p4a3qm7jrkjp3d0jlzrl29z225ch9hf5m951")) + (snippet + #~(begin (delete-file "src/tests/lib/libteststatic.a"))))) (build-system cargo-build-system) (arguments `(#:tests? #f ;source is missing some test files -- cgit v1.2.3 From 0bba6e46adf717e0ba08bfaaa9b4397ccccef154 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 16:28:52 +0300 Subject: gnu: rust-standback-0.2: Fix inputs. * gnu/packages/crates-io.scm (rust-standback-0.2)[cargo-inputs]: Move rust-version-check-0.9 to here ... [cargo-development-inputs]: ... from here. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 648c4579f5..cb4b41ad4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -66430,7 +66430,7 @@ deeply recursive algorithms that may accidentally blow the stack.") "1zr8zy3kzryaggz3k0j4135m3zbd31pyqmja8cyj8yp07mpzn4z1")))) (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs + `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.9)))) (home-page "https://github.com/jhpratt/standback") (synopsis "New standard library, old compiler") -- cgit v1.2.3 From be5eb5e789faefc629745bcf41cee07d797a431c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 16:32:13 +0300 Subject: gnu: rust-tokio-0.1: Don't rely on deprecated features. * gnu/packages/crates-io.scm (rust-tokio-0.1)[source]: Add snippet to remove 'tokio' feature from dependencies. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb4b41ad4a..f2d7f28716 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -72428,7 +72428,11 @@ writing asynchronous I/O backed applications.") (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as")))) + (base32 "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("features = \\[\"tokio\"\\]") "")))))) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) -- cgit v1.2.3 From fc6e26d07e25eae40821beeb67d0d618b7df4dc7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 16:48:28 +0300 Subject: gnu: rust-tokio-core-0.1: Don't rely on deprecated features. * gnu/packages/crates-io.scm (rust-tokio-core-0.1)[source]: Add snippet to remove 'tokio' feature from dependencies. --- gnu/packages/crates-io.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2d7f28716..10b600f61d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -72531,7 +72531,11 @@ writing asynchronous I/O backed applications.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wbgg59mxfvrhzv97y56nh3gmnmw3jj9dhgkmvz27410jjxzpvxf")))) + "0wbgg59mxfvrhzv97y56nh3gmnmw3jj9dhgkmvz27410jjxzpvxf")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("features = \\[\"tokio\"\\]") "")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 33cf42a3ede56562e433c7fa593210759c95dd37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 16:53:38 +0300 Subject: gnu: rust-tokio-rustls-0.9: Skip build. * gnu/packages/crates-io.scm (rust-tokio-rustls-0.9)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 10b600f61d..3c11c494f4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -73304,7 +73304,8 @@ Rustls.") "1jd63sl177sxacnksaxhazzmamwds98xk3niprh2qib75a1rk8cm")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-futures" ,rust-futures-0.1) ("rust-iovec" ,rust-iovec-0.1) -- cgit v1.2.3 From 01e4e5db6b05168bb00b282b59c29651b437441b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 17:28:16 +0300 Subject: gnu: rust-trust-dns-https-0.3: Skip build. * gnu/packages/crates-io.scm (rust-trust-dns-https-0.3)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3c11c494f4..d815270796 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -75262,7 +75262,8 @@ the Trust-DNS client to use DNS over HTTPS.") (base32 "14ps1fxngm8d3ynp9jf86zrqbyzjzh62v5grwrqb1q0xhbz98vv1")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;network unreachable + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:tests? #false ;network unreachable #:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-data-encoding" ,rust-data-encoding-2) -- cgit v1.2.3 From 30ab1ba8cde3492650796882a7467591a72bd99c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 17:30:38 +0300 Subject: gnu: rust-trust-dns-https-0.19: Add missing input. * gnu/packages/crates-io.scm (rust-trust-dns-https-0.19)[native-inputs]: Add perl. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d815270796..0f32b2b018 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -75212,7 +75212,8 @@ the Trust-DNS client to use DNS over HTTPS.") ("rust-webpki-roots" ,rust-webpki-roots-0.19)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-futures" ,rust-futures-0.3)))))) + ("rust-futures" ,rust-futures-0.3)))) + (native-inputs (list perl)))) (define-public rust-trust-dns-https-0.18 (package -- cgit v1.2.3 From 16a7feb820df65c4f4de157b5f324a8b72a3dec0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 17:38:36 +0300 Subject: gnu: rust-trust-dns-rustls-0.6: Skip building. * gnu/packages/crates-io.scm (rust-trust-dns-rustls-0.6)[arguments]: Skip building. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f32b2b018..9c163dcb0f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -76003,7 +76003,8 @@ the Trust-DNS client to use rustls for TLS.") (inputs (list openssl)) (arguments - `(#:cargo-test-flags + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-test-flags '("--release" "--" "--skip=tests::test_tls_client_stream_ipv4") #:cargo-inputs (("rust-futures" ,rust-futures-0.1) -- cgit v1.2.3 From 1b94fc0904c7c12245c432d87644e79ec5fca070 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 17:50:06 +0300 Subject: gnu: rust-utf8-width-0.1: Update to 0.1.6. * gnu/packages/crates-io.scm (rust-utf8-width-0.1): Update to 0.1.6. [cargo-development-inputs]: Add rust-bencher-0.1. --- gnu/packages/crates-io.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9c163dcb0f..8918d2f740 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -77993,15 +77993,17 @@ Unix users and groups.") (define-public rust-utf8-width-0.1 (package (name "rust-utf8-width") - (version "0.1.4") + (version "0.1.6") (source (origin (method url-fetch) (uri (crate-uri "utf8-width" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ylf5mvzck81iszchxyqmhwimkcdqv7jhazvd454g911cchsqwch")))) + (base32 "18fbr6bbkfprs0hb2pdz3ckfb6i1gm0j0x7ka3fhvbyd5m2ck42i")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))) (home-page "https://magiclen.org/utf8-width") (synopsis "Determine the width of a UTF-8 character") (description -- cgit v1.2.3 From 85afed55b0bf85f3b47b39996bf332aa616e66c5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 17:58:24 +0300 Subject: gnu: rust-vcpkg-0.2: Remove bundled libraries. * gnu/packages/crates-io.scm (rust-vcpkg-0.2)[source]: Add snippet to remove bundled precompiled libraries. --- gnu/packages/crates-io.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8918d2f740..30707b7304 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -78371,7 +78371,16 @@ write operations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "09i4nf5y8lig6xgj3f7fyrvzd3nlaw4znrihw8psidvv5yk4xkdc")))) + "09i4nf5y8lig6xgj3f7fyrvzd3nlaw4znrihw8psidvv5yk4xkdc")) + (snippet + #~(begin (use-modules (guix build utils)) + (for-each delete-file-recursively + '("test-data/normalized/installed/arm64-ios" + "test-data/normalized/installed/x64-osx" + "test-data/normalized/installed/x64-windows" + "test-data/normalized/installed/x64-windows-static" + "test-data/normalized/installed/x86-windows" + "test-data/no-status/installed/x64-windows")))))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests want mysql, harfbuzz, graphite2. -- cgit v1.2.3 From b6ef0b05a757fbba207782bf853447c6e61b968b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 18:14:16 +0300 Subject: gnu: rust-webpki-0.18: Skip building. * gnu/packages/crates-io.scm (rust-webpki-0.18)[arguments]: Skip building. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 30707b7304..98a157f41a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -79818,7 +79818,8 @@ Verification.") (base32 "0zx1v8afa4ig97dyqfrnlj5i7pib6dnfw88qn2iiqhfq2rrrdmqp")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.13 + #:cargo-inputs (("rust-ring" ,rust-ring-0.13) ("rust-untrusted" ,rust-untrusted-0.6)) #:cargo-development-inputs -- cgit v1.2.3 From 0ea92b28b69e859704399b87e8a257e940e0f7b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 18:15:52 +0300 Subject: gnu: rust-webpki-0.19: Skip building. * gnu/packages/crates-io.scm (rust-webpki-0.19)[arguments]: Skip building. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98a157f41a..f2860c4835 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -79786,7 +79786,8 @@ Verification.") (base32 "10nhyxlqsa4caxlxrijm5h79rdg6ld8hqy78ldjnnfhaj3biqzjg")))) (arguments - `(#:tests? #f ; tests fail to build "missing file tests/ed25519/ee.der" + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:tests? #f ; tests fail to build "missing file tests/ed25519/ee.der" #:cargo-inputs (("rust-ring" ,rust-ring-0.14) ("rust-untrusted" ,rust-untrusted-0.6)) -- cgit v1.2.3 From 328412ca7ea353cca425a3c4b1be428280cdf31a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Oct 2023 18:19:43 +0300 Subject: gnu: rust-webpki-roots-0.16: Skip building. * gnu/packages/crates-io.scm (rust-webpki-roots-0.16)[arguments]: Skip building. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2860c4835..5303d036d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -79990,7 +79990,8 @@ with webpki.") (base32 "03ny02mwqdgd2ff23k03kbwr2rrcaymxhp7jcjjikfh340hs83y1")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-inputs (("rust-untrusted" ,rust-untrusted-0.6) ("rust-webpki" ,rust-webpki-0.19)))))) -- cgit v1.2.3 From 27a41027976ea3e785c4998461c336485e384615 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:13:49 +0300 Subject: gnu: rust-glium-0.25: Fix inputs. * gnu/packages/crates-io.scm (rust-glium-0.25)[cargo-inputs]: Move rust-gl-gnerator-0.11 to here ... [cargo-development-inputs]: ... from here. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5303d036d3..856d0e800f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29128,6 +29128,7 @@ OpenGL's old and error-prone API.") `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) ("rust-fnv" ,rust-fnv-1) + ("rust-gl-generator" ,rust-gl-generator-0.11) ("rust-glutin" ,rust-glutin-0.21) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-smallvec" ,rust-smallvec-0.6) @@ -29135,7 +29136,6 @@ OpenGL's old and error-prone API.") #:cargo-development-inputs (("rust-cgmath" ,rust-cgmath-0.17) ("rust-genmesh" ,rust-genmesh-0.6) - ("rust-gl-generator" ,rust-gl-generator-0.11) ("rust-image" ,rust-image-0.21) ("rust-obj" ,rust-obj-0.9) ("rust-rand" ,rust-rand-0.6)))))) -- cgit v1.2.3 From 582d6786560d1825371502585421a5280e475f80 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:27:51 +0300 Subject: gnu: Add rust-hdrhistogram-7. * gnu/packages/crates-io.scm (rust-hdrhistogram-7): New variable. (rust-hdrhistogram-6): Inherit from rust-hdrhistogram-7. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 856d0e800f..a184a7e988 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30415,8 +30415,39 @@ their key-value pairs in a user controllable order.") #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) +(define-public rust-hdrhistogram-7 + (package + (name "rust-hdrhistogram") + (version "7.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "hdrhistogram" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a1al1rfxcqmx0n9h100ggvg036f4rv69fq12kimazvw9zsvj6bz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-flate2" ,rust-flate2-1) + ("rust-nom" ,rust-nom-7) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-3) + ("rust-ieee754" ,rust-ieee754-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rug" ,rust-rug-1)))) + (home-page "https://github.com/HdrHistogram/HdrHistogram_rust") + (synopsis "Port of HdrHistogram to Rust") + (description "This package provides a port of @code{HdrHistogram} to Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hdrhistogram-6 (package + (inherit rust-hdrhistogram-7) (name "rust-hdrhistogram") (version "6.3.4") (source @@ -30426,7 +30457,6 @@ their key-value pairs in a user controllable order.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "17dqk0rp8kimcd8wr542i8cny91fkclw7a2xzszar95wrpmk3lq8")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -30435,11 +30465,7 @@ their key-value pairs in a user controllable order.") ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) ("rust-flate2" ,rust-flate2-1) ("rust-nom" ,rust-nom-4) - ("rust-num-traits" ,rust-num-traits-0.2)))) - (home-page "https://github.com/HdrHistogram/HdrHistogram_rust") - (synopsis "Port of HdrHistogram to Rust") - (description "This package provides a port of HdrHistogram to Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-num-traits" ,rust-num-traits-0.2)))))) (define-public rust-headers-0.3 (package -- cgit v1.2.3 From bbbed725c9dcccf4d9b886d966eed28082e25022 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:29:12 +0300 Subject: gnu: Add rust-tower-test-0.4. * gnu/packages/crates-io.scm (rust-tower-test-0.4): New variable. rust-tower-test-0.3): Inherit from rust-tower-test-0.4. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a184a7e988..5fd7f842ce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -74546,8 +74546,37 @@ composition between @code{Service}s.") request/response based, client or server.") (license license:expat))) +(define-public rust-tower-test-0.4 + (package + (name "rust-tower-test") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tower-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19zgjwzr9216yg1ayrnsly06lqdv96m2z1xq0bmf9fgazxrnfm54")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/tower-rs/tower") + (synopsis "Utilities for writing client and server @code{Service} tests") + (description "This package provides utilities for writing client and +server @code{Service} tests.") + (license license:expat))) + (define-public rust-tower-test-0.3 (package + (inherit rust-tower-test-0.4) (name "rust-tower-test") (version "0.3.0") (source @@ -74558,7 +74587,6 @@ request/response based, client or server.") (sha256 (base32 "1j2k07g3z8ascq7r30bmw3b75v8lhd63mhfl60y59a74q71bp94v")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) @@ -74568,12 +74596,7 @@ request/response based, client or server.") ("rust-tower-layer" ,rust-tower-layer-0.3) ("rust-tower-service" ,rust-tower-service-0.3)) #:cargo-development-inputs - (("rust-tokio" ,rust-tokio-0.2)))) - (home-page "https://github.com/tower-rs/tower") - (synopsis "Utilities for writing client and server @code{Service} tests") - (description "This package provides utilities for writing client and -server @code{Service} tests.") - (license license:expat))) + (("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-tower-util-0.3 (package -- cgit v1.2.3 From fe208f15ca69894ffbb1df51007e5702a3220d60 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:29:53 +0300 Subject: gnu: rust-tower-0.4: Update to 0.4.13. * gnu/packages/crates-io.scm (rust-tower-0.4): Update to 0.4.13. [arguments]: Don't skip build. [cargo-inputs]: Replace rust-hdrhistogram-6 with 7, rust-tokio-util-0.6 with 0.7. [cargo-development-inputs]: Add rust-futures-0.3, rust-hdrhistogram-7, rust-http-0.2, rust-lazy-static-1, rust-pin-project-lite-0.2, rust-tokio-1, rust-tokio-stream-0.1, rust-tokio-test-0.4, rust-tower-test-0.4, rust-tracing-subscriber-0.3. --- gnu/packages/crates-io.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5fd7f842ce..1a0df39a68 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -74470,21 +74470,20 @@ One-Time Password library.") (define-public rust-tower-0.4 (package (name "rust-tower") - (version "0.4.10") + (version "0.4.13") (source (origin (method url-fetch) (uri (crate-uri "tower" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "001wx4iiyhmiih9f93szjsfdm5mzlr0n093bhqf178azzw7m03n0")))) + (base32 "073wncyqav4sak1p755hf6vl66njgfc1z1g1di9rxx3cvvh9pymq")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-hdrhistogram" ,rust-hdrhistogram-6) + ("rust-hdrhistogram" ,rust-hdrhistogram-7) ("rust-indexmap" ,rust-indexmap-1) ("rust-pin-project" ,rust-pin-project-1) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) @@ -74492,10 +74491,21 @@ One-Time Password library.") ("rust-slab" ,rust-slab-0.4) ("rust-tokio" ,rust-tokio-1) ("rust-tokio-stream" ,rust-tokio-stream-0.1) - ("rust-tokio-util" ,rust-tokio-util-0.6) + ("rust-tokio-util" ,rust-tokio-util-0.7) ("rust-tower-layer" ,rust-tower-layer-0.3) ("rust-tower-service" ,rust-tower-service-0.3) - ("rust-tracing" ,rust-tracing-0.1)))) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.3) + ("rust-hdrhistogram" ,rust-hdrhistogram-7) + ("rust-http" ,rust-http-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-tower-test" ,rust-tower-test-0.4) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) (home-page "https://github.com/tower-rs/tower") (synopsis "Library for building clients and servers") (description -- cgit v1.2.3 From e20214936f2b0c9ac6f9435acfa3726c93443e59 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:31:42 +0300 Subject: gnu: rust-tower-layer-0.3: Update to 0.3.2. * gnu/packages/crates-io.scm (rust-tower-layer-0.3): Update to 0.3.2. [cargo-development-inputs]: Add rust-tower-0.4. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a0df39a68..ad58513cb7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -74516,18 +74516,19 @@ robust clients and servers.") (define-public rust-tower-layer-0.3 (package (name "rust-tower-layer") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (crate-uri "tower-layer" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0qiskpgz6zzy3a894vyr9yzq0i7q142rciggc3wv1rizdm3cjfrl")))) + (base32 "1l7i17k9vlssrdg4s3b0ia5jjkmmxsvv8s9y9ih0jfi8ssz8s362")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-tower-service" ,rust-tower-service-0.3)))) + (("rust-tower" ,rust-tower-0.4) + ("rust-tower-service" ,rust-tower-service-0.3)))) (home-page "https://github.com/tower-rs/tower") (synopsis "Easy composition between @code{Service}s") (description "This package decorates a @code{Service} to allow easy -- cgit v1.2.3 From 6fcb1f8184f87f25a23282d86c173315a1ea4e10 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:32:22 +0300 Subject: gnu: rust-tower-service-0.3: Update to 0.3.2. * gnu/packages/crates-io.scm (rust-tower-service-0.3): Update to 0.3.2. [cargo-development-inputs]: Add rust-futures-0.3, rust-tokio-1, rust-tower-layer-0.3. Replace rust-http-0.1 with 0.2. --- gnu/packages/crates-io.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad58513cb7..e06f2f5b5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -74538,7 +74538,7 @@ composition between @code{Service}s.") (define-public rust-tower-service-0.3 (package (name "rust-tower-service") - (version "0.3.0") + (version "0.3.2") (source (origin (method url-fetch) @@ -74546,11 +74546,14 @@ composition between @code{Service}s.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q4q53w82w1wd71x7vbspg2l3jicb6al2w1qdwxmnjrz8jzvd1z9")))) + "0lmfzmmvid2yp2l36mbavhmqgsvzqf7r2wiwz73ml4xmwaf1rg5n")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-http" ,rust-http-0.1)))) + (("rust-futures" ,rust-futures-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower-layer" ,rust-tower-layer-0.3)))) (home-page "https://github.com/tower-rs/tower") (synopsis "Asynchronous, request / response based, client or server") (description "This package provides a trait representing an asynchronous, -- cgit v1.2.3 From 6c9e9c7233ce494cf782c543d0e8075872d97550 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:40:22 +0300 Subject: gnu: rust-compact-str-0.7: Update to 0.7.1. * gnu/packages/crates-io.scm (rust-compact-str-0.7): Update to 0.7.1. [source]: Add snippet to allow newer versions of dependencies. [cargo-development-inputs]: Add rust-rkyv-0.7. --- gnu/packages/crates-io.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e06f2f5b5b..2453ecd96c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13987,14 +13987,18 @@ idiomatic wrappers for Mac OS X's CommonCrypto library.") (define-public rust-compact-str-0.7 (package (name "rust-compact-str") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (crate-uri "compact_str" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lbk5vkn6vriwx98pybfsgy093ga6ilpm5gkcd8v7cgcg5gq1w5z")))) + "0gvvfc2c6pg1rwr2w36ra4674w3lzwg97vq2v6k791w30169qszq")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("1\\.0\\.\\*") "1.0.0")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -14017,6 +14021,7 @@ idiomatic wrappers for Mac OS X's CommonCrypto library.") ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) ("rust-rayon" ,rust-rayon-1) + ("rust-rkyv" ,rust-rkyv-0.7) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-test-case" ,rust-test-case-2) -- cgit v1.2.3 From 068f98887519bd1bb6ab9b03a0f85802b34c8470 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:44:08 +0300 Subject: gnu: rust-nitrokey-sys-3: Update to 3.7.0. * gnu/packages/crates-io.scm (rust-nitrokey-sys-3): Update to 3.7.0. [cargo-inputs]: Add rust-bindgen-0.55, rust-cc-1. --- gnu/packages/crates-io.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2453ecd96c..4f565d69ea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42688,7 +42688,7 @@ with Nitrokey devices.") (define-public rust-nitrokey-sys-3 (package (name "rust-nitrokey-sys") - (version "3.6.0") + (version "3.7.0") (source (origin (method url-fetch) @@ -42696,8 +42696,12 @@ with Nitrokey devices.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08c3lnb8iqx000jd5rzvrdvv4ihjyw3x3s8q11dw56is0nmjyvws")))) + "0hcns32sclzf8xbdjg5iqndbn1b66l3j61zbgbl8ds8n6nind16q")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.55) + ("rust-cc" ,rust-cc-1)))) (home-page "https://git.sr.ht/~ireas/nitrokey-sys-rs") (synopsis "Low-level Rust bindings for libnitrokey") (description -- cgit v1.2.3 From 48e0a41d32c3cb1641069d1c9338739252dacbd9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:45:30 +0300 Subject: gnu: rust-nitrokey-test-0.5: Skip build. * gnu/packages/crates-io.scm (rust-nitrokey-test-0.5)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4f565d69ea..117b3aa1fe 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42723,7 +42723,8 @@ communication with Nitrokey devices.") "197j9r2s4ydzbqfydza6v31mgcsgd29jpidz4psqawjdm49f8lg6")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Wants an older version of rust-nitrokey. + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("quote" ,rust-quote-1) ("syn" ,rust-syn-1)))) -- cgit v1.2.3 From 80c69940dba5b077b19a92d47c8f8999453d0970 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:54:10 +0300 Subject: gnu: rust-rustfix-0.6: Update to 0.6.1. * gnu/packages/crates-io.scm (rust-rustfix-0.6): Update to 0.6.1. [arguments]: Skip build. [cargo-inputs]: Add rust-anyhow-1, rust-log-0.4, rust-serde-1, rust-serde-json-1. --- gnu/packages/crates-io.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 117b3aa1fe..49c6a01788 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58717,17 +58717,22 @@ rustc compiler.") (define-public rust-rustfix-0.6 (package (name "rust-rustfix") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri "rustfix" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0apkjxv3z70vhnyz2kpwsivvndk6qk7kkp0rf7sg8pk7q1gy02vg")))) + (base32 "10b4qlvfwljp7yss8afj0lnn8vqj78n93n9vfmkq9616kqyqblpc")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency chain here + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/rust-lang/rustfix") (synopsis "Automatically apply the suggestions made by rustc") (description "Automatically apply the suggestions made by rustc.") -- cgit v1.2.3 From 7fc67b20b61bf9dd647f0d518664131e8bf8bda4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:56:33 +0300 Subject: gnu: rust-rustls-0.15: Skip build. * gnu/packages/crates-io.scm (rust-rustls-0.15)[arguments]: Skip build. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 49c6a01788..522e414eb8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59158,7 +59158,8 @@ rustc compiler.") (base32 "0vh93fhqfbn4ysw4xzkpkpqdz36xixz4mhs1qllgldfq5iay6wgj")))) (arguments - `(#:tests? #f ;; 1/111 tests fail (test file not found) + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:tests? #f ;; 1/111 tests fail (test file not found) #:cargo-inputs (("rust-base64" ,rust-base64-0.10) ("rust-log" ,rust-log-0.4) -- cgit v1.2.3 From 94efc209c9995f1209b55d874b7aa276d09ef345 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 18:59:14 +0300 Subject: gnu: rust-cortex-m-0.7: Remove precompiled files. * gnu/packages/crates-io.scm (rust-cortex-m-0.7)[source]: Add snippet to remove precompiled files. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 522e414eb8..bbd3e601dd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17836,7 +17836,10 @@ hash functions.") (uri (crate-uri "cortex-m" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cw3nyip3s81r6qaa3azrb0654jxw465j5fm126fqja48bpikj9a")))) + (base32 "1cw3nyip3s81r6qaa3azrb0654jxw465j5fm126fqja48bpikj9a")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "bin"))))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From c85857c063ad1df1a356335e36170ffd7df3e08c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 12 Oct 2023 19:02:15 +0300 Subject: gnu: rust-cortex-m-0.7: Update to 0.7.7. * gnu/packages/crates-io.scm (rust-cortex-m-0.7): Update to 0.7.7. [arguments]: Don't skip build. [cargo-inputs]: Add rust-critical-section-1, rust-serde-1. --- gnu/packages/crates-io.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bbd3e601dd..03bc2240c1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17829,24 +17829,25 @@ hash functions.") (define-public rust-cortex-m-0.7 (package (name "rust-cortex-m") - (version "0.7.3") + (version "0.7.7") (source (origin (method url-fetch) (uri (crate-uri "cortex-m" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cw3nyip3s81r6qaa3azrb0654jxw465j5fm126fqja48bpikj9a")) + (base32 "1fbca698v4gv57mv5fc48jrz8wcy6sv675n6fsrsah4qykc11ilf")) (snippet #~(begin (use-modules (guix build utils)) (delete-file-recursively "bin"))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bare-metal" ,rust-bare-metal-0.2) ("rust-bitfield" ,rust-bitfield-0.13) + ("rust-critical-section" ,rust-critical-section-1) ("rust-embedded-hal" ,rust-embedded-hal-0.2) + ("rust-serde" ,rust-serde-1) ("rust-volatile-register" ,rust-volatile-register-0.2)))) (home-page "https://github.com/rust-embedded/cortex-m") (synopsis "Low level access to Cortex-M processors") -- cgit v1.2.3 From 0a2f10ac11a427ed5fe80e3e59b6ce53a1c81317 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Oct 2023 13:48:24 +0300 Subject: gnu: rust-zstd-0.9: Downgrade to 0.9.2+zstd.1.5.1. Later versions of this crate are yanked upstream. * gnu/packages/crates-io.scm (rust-zstd-0.9): Downgrade to 0.9.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03bc2240c1..4a8ffae766 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -83153,7 +83153,7 @@ implementation that works everywhere, even WASM!") (package (inherit rust-zstd-0.11) (name "rust-zstd") - (version "0.9.3+zstd.1.5.2") + (version "0.9.2+zstd.1.5.1") (source (origin (method url-fetch) @@ -83162,7 +83162,7 @@ implementation that works everywhere, even WASM!") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15dsisk3g9ncbxzb6miwav35p2v98az6clh5qdab5jxn05l9qzrp")) + "0m5aik2jy2w1g68i4isa0c3gq9a7avq9abgjfjbc6f60yqdym413")) (modules '((guix build utils))) (snippet '(begin (substitute* "Cargo.toml" -- cgit v1.2.3 From 4fcf0425328d45f0204dc92ef58fdcc63caa6382 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 13 Oct 2023 13:50:19 +0300 Subject: gnu: transanno: Fix build. * gnu/packages/bioinformatics.scm (transanno)[arguments]: Run the test suite. Don't patch Cargo.toml in liftover-rs. Don't patch crate in vendor-dir. [native-inputs]: Add pkg-config. [inputs]: Add xz. --- gnu/packages/bioinformatics.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 44eeb53e95..804693427d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4696,26 +4696,17 @@ accurately delineate genomic rearrangements throughout the genome.") (arguments (list #:install-source? #false ;fails - #:tests? #false ;"cargo test" ignores build.rs + #:tests? #true #:phases #~(modify-phases %standard-phases (add-after 'unpack 'prepare-test-files (lambda _ (delete-file "Cargo.lock") - (substitute* "liftover-rs/Cargo.toml" - (("anyhow = \"1\"") "anyhow = \"1.0.65\"")) (substitute* "liftover-rs/prepare-test.sh" (("/bin/bash") (string-append #$(this-package-native-input "bash") "/bin/bash"))) (invoke "bash" "prepare-test-files.sh"))) - (add-before 'patch-cargo-checksums 'do-not-build-xz - (lambda _ - ;; Detection of liblzma (in rust-lzma-sys, pulled in by - ;; rust-hts-sys) doesn't seem to work, or perhaps it really does - ;; request a static build somewhere. - (substitute* "guix-vendor/rust-lzma-sys-0.1.17.tar.xz/build.rs" - (("if .want_static && .msvc && pkg_config::probe_library\\(\"liblzma\"\\).is_ok\\(\\)") "")))) (add-before 'install 'chdir (lambda _ (chdir "transanno")))) #:cargo-inputs @@ -4737,7 +4728,8 @@ accurately delineate genomic rearrangements throughout the genome.") #:cargo-development-inputs `(("rust-clap" ,rust-clap-2) ("rust-lazy-static" ,rust-lazy-static-1)))) - (native-inputs (list bash)) + (native-inputs (list bash pkg-config)) + (inputs (list xz)) (home-page "https://github.com/informationsea/transanno") (synopsis "LiftOver tool for new genome assemblies") (description "This package provides an accurate VCF/GFF3/GTF LiftOver tool -- cgit v1.2.3 From 519995f36f1018a74ab534c33db0c2b70ddc48a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Oct 2023 23:41:41 +0300 Subject: gnu: Add rust-1.71. * gnu/packages/rust.scm (rust-1.71): New variable. --- gnu/packages/rust.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 5e860057bc..e158a144e5 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -743,6 +743,25 @@ safety and thread safety guarantees.") ;; for a precompiled library. (patches (search-patches "rust-1.70-fix-rustix-build.patch"))))))) +(define rust-1.71 + (let ((base-rust + (rust-bootstrapped-package + rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-cargo-checksums + (lambda _ + (substitute* (cons* "Cargo.lock" + "src/bootstrap/Cargo.lock" + (find-files "src/tools" "Cargo.lock")) + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor")))))))))) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) -- cgit v1.2.3 From d45992833b4c290de041afaae50eb386d5ea944e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Oct 2023 00:09:33 +0300 Subject: gnu: Add rust-1.72. * gnu/packages/rust.scm (rust-1.72): New variable. --- gnu/packages/rust.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e158a144e5..5d81655423 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -762,6 +762,31 @@ safety and thread safety guarantees.") (string-append name "\"" ,%cargo-reference-hash "\""))) (generate-all-checksums "vendor")))))))))) +(define rust-1.72 + (let ((base-rust + (rust-bootstrapped-package + rust-1.71 "1.72.1" "15gqd1jzhnc16a7gjmav4x1v83jjbzyjh1gvcdfvpkajd9gq8j3z"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$")) + ;; Adjust rustc_driver to explicitly use rustix with libc backend. + (substitute* "compiler/rustc_driver/Cargo.toml" + (("rustix = \"=0.37.11\"") + (string-append "rustix = { version = \"=0.37.11\"," + " features = [\"use-libc\"] }")))))))))) + (define (make-ignore-test-list strs) "Function to make creating a list to ignore tests a bit easier." (map (lambda (str) -- cgit v1.2.3 From 003dc790fdccb2e762edbe09abbc1b6f24f18de0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Oct 2023 08:30:14 +0300 Subject: Revert "build: cargo-build-system: Disable tests by default." This reverts commit 37667443074a6de29f7665868f102111d62f0af9. This change needs more discussion. --- gnu/packages/admin.scm | 7 +-- gnu/packages/bioinformatics.scm | 2 - gnu/packages/crypto.scm | 6 +-- gnu/packages/gnome.scm | 1 - gnu/packages/python-crypto.scm | 2 - gnu/packages/python-xyz.scm | 1 - gnu/packages/rust-apps.scm | 106 +++++++++++++--------------------------- gnu/packages/sequoia.scm | 3 +- gnu/packages/syndication.scm | 1 - gnu/packages/terminals.scm | 3 +- gnu/packages/text-editors.scm | 6 +-- gnu/packages/tree-sitter.scm | 1 - gnu/packages/video.scm | 3 +- gnu/packages/web.scm | 8 ++- guix/build-system/cargo.scm | 2 +- 15 files changed, 46 insertions(+), 106 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0b21d34a6a..a8d4269fbb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5395,8 +5395,7 @@ it won't take longer to install 15 machines than it would to install just 2.") (base32 "1b79lb0vikh5vwpdlyga6zwzm11gpsd7ghp8zb0q2m6mlqlj5by3")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26) ("rust-pam-sys" ,rust-pam-sys-0.5) ("rust-rpassword" ,rust-rpassword-5) @@ -5501,8 +5500,7 @@ interfering with any pam-mount configuration."))) "1k0jmgh0rjbnb49gkvs0a4d7z9xb6pad8v5w5f7my4s0rfpk7wd9")))) (build-system cargo-build-system) (arguments - (list #:tests? #~(not (%current-target-system)) - #:cargo-inputs + (list #:cargo-inputs `(("rust-chrono" ,rust-chrono-0.4) ("rust-getopts" ,rust-getopts-0.2) ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) @@ -5921,7 +5919,6 @@ file or files to several hosts.") `(#:cargo-test-flags (list "--release" "--" "--skip=test_apparent_size") - #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 804693427d..ea0fe17b21 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2654,7 +2654,6 @@ compressed files.") (("find_package\\(biosoup 0.10.0 QUIET\\)") "find_package(biosoup 0.10.0 CONFIG)") (("GTest_FOUND") "TRUE"))))) - #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-bio" ,rust-bio-0.33) @@ -21094,7 +21093,6 @@ handling."))) (build-system cargo-build-system) (arguments (list - #:tests? #~(not (%current-target-system)) #:install-source? #false #:features '(list "extension-module") #:cargo-test-flags '(list "--features=extension-module") diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d4eb667286..c7145bcb0c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -268,8 +268,7 @@ OpenBSD tool of the same name.") (base32 "1lmp83bxdg53c4n35fbwr3rkh6178y75fwsn25hf1kn62f2gbdnj")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2) ("rust-rpassword" ,rust-rpassword-7) ("rust-scrypt" ,rust-scrypt-0.11)))) @@ -1606,8 +1605,7 @@ SHA-3, and BLAKE2.") (base32 "05k0vn7gpbvjr925vjc5yzvhiyrmkw9pqmch5fr4ir7s8wiaq2fm")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - ;; Install the source so that Cargo.toml is installed, because that is + `(;; Install the source so that Cargo.toml is installed, because that is ;; the only reference to the license information. #:install-source? #t #:phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5fcc9409ef..865ff3b9d7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3513,7 +3513,6 @@ for dealing with different structured file formats.") (outputs '("out" "doc" "debug")) (arguments (list - #:tests? #~(not (%current-target-system)) #:install-source? #f #:modules '((guix build cargo-build-system) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f7f8a60d23..b787d6207f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -362,7 +362,6 @@ risk.") (build-system cargo-build-system) (arguments (list - #:tests? #~(not (%current-target-system)) #:phases #~(modify-phases %standard-phases (add-after 'install 'build-python-module @@ -569,7 +568,6 @@ ciphers, message digests and key derivation functions.") (guix build utils) (srfi srfi-1) (ice-9 match)) - #:tests? #~(not (%current-target-system)) #:install-source? #f ;; As seen in noxfile.py #:cargo-test-flags ''("--release" "--no-default-features") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fcce6ca425..34cfc07307 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3053,7 +3053,6 @@ help formatter.") (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module (assoc-ref py:%standard-phases 'install))) - #:tests? #~(not (%current-target-system)) #:cargo-inputs `(("rust-ahash" ,rust-ahash-0.8) ("rust-arrayvec" ,rust-arrayvec-0.7) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index c98bd86ada..d1a5da66d9 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -99,8 +99,7 @@ (base32 "1mhrl4j5r6wzsnwpqsbgzny5vqschyjm3gnk4y88har7skk7j19v")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-configparser" ,rust-configparser-2) ("rust-env-logger" ,rust-env-logger-0.8) ("rust-getopts" ,rust-getopts-0.2) @@ -139,8 +138,7 @@ low-end hardware and serving many concurrent requests.") (base32 "1kgzz92mkyzn7mbsdpik1q21kl38i4almn01k99nww3p0vgx9514")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-test-flags + `(#:cargo-test-flags '("--release" "--" "--skip=dns::client::tests::test_tcp_client" "--skip=dns::client::tests::test_udp_client") @@ -213,8 +211,7 @@ alternative zones.") (base32 "05sj0chxpai26fhk1k7p5m54v3j7n1x64ayx53mcimsj1skdr77m")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-colours" ,rust-ansi-colours-1) ("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) @@ -276,8 +273,7 @@ paging.") (base32 "1b0mz1ki2ksxni6g49x5l5j9ijpyhc11mywvxr9i9h3nr098nc5l")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f ;; https://github.com/mookid/diffr/issues/79 #:cargo-test-flags '("--release" "--" @@ -317,8 +313,7 @@ highlighting tool to ease code review from your terminal.") (base32 "1m73d7rzi0p5c1hn0081d2235kcyapdza7h0vqf5jhnirpnjn793")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) ("rust-clap" ,rust-clap-2) ("rust-colored" ,rust-colored-1) @@ -359,8 +354,7 @@ Ansible syntax. Benchmark files can be written in YAML.") (base32 "1611h27i8fm3jndscd6w65z8z7w09nnrm61vdgs9kb8ln57gqm8x")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f #:cargo-inputs (("rust-getopts" ,rust-getopts-0.2) ("rust-regex" ,rust-regex-1) @@ -398,8 +392,7 @@ Features include: "1dd7waq2bnxc1xwygqphi8k1g2qzykr6fk0q4rgrhhxp2jd09f04")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-datetime" ,rust-datetime-0.5) @@ -485,8 +478,7 @@ also knows about symlinks, extended attributes, and Git.") "186217yyb0znfn4jcc9l3i51fhfyb23lhbm3gg084sdrbj6bdnbg")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-test-flags + `(#:cargo-test-flags '("--release" "--" ;; No user 'root' in the build environment. @@ -577,8 +569,7 @@ provides defaults for 80% of the use cases.") "0sipag77196467idbznbk5q5lwhqz85zw7y1pwg9b27jxqyk04rp")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-2) @@ -609,7 +600,6 @@ characters, ASCII whitespace characters, other ASCII characters and non-ASCII.") `(#:modules ((guix build cargo-build-system) (guix build utils) (srfi srfi-26)) - #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-cfg-if" ,rust-cfg-if-0.1) @@ -669,7 +659,6 @@ characters, ASCII whitespace characters, other ASCII characters and non-ASCII.") (build-system cargo-build-system) (arguments `(#:features '("pulseaudio" "libpulse-binding") - #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -762,8 +751,7 @@ bar. It is also compatible with sway.") (base32 "0kafd87zmjf7wswyiqakqd2r5b8q3a761ipsihmrg9wr57k5zlis")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-test-flags + `(#:cargo-test-flags '("--release" "--" "--skip=functions::env_var_functions" "--skip=string::shebang_backtick") @@ -867,7 +855,6 @@ bar. It is also compatible with sway.") #:imported-modules ((guix build cargo-build-system) (guix build cargo-utils) ,@%pyproject-build-system-modules) - #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-test-flags '("--release" "--" @@ -1025,8 +1012,7 @@ bar. It is also compatible with sway.") "1gv4imhjgxmyxaa996yshcjlakmrjw9pf4rycp90pq675cn9sz7k")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-0.2) ("rust-clap" ,rust-clap-2) ("rust-grep" ,rust-grep-0.2) @@ -1083,8 +1069,7 @@ gitignore rules.") "1m5kzpqq9pgc19lbnh20iaq654lzlmc1m5fc9f73w2vpwqdiw1qf")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs (("rust-clap" ,rust-clap-2) + `(#:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-glob" ,rust-glob-0.3) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) @@ -1117,8 +1102,7 @@ touchscreen devices.") (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f #:cargo-build-flags '("--release" "-p" "swc_cli") #:cargo-test-flags @@ -1253,8 +1237,7 @@ browsers.") "19wfjz7z4kqjfjmnq1bl6dhsvskjy6r656fqmbha9dfdspbsnmd0")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f ;; error[E0463]: can't find crate for `cargo_test_macro` #:tests? #f #:cargo-inputs @@ -1327,8 +1310,7 @@ by modifying your @file{Cargo.toml} file from the command line.") "173spqqpyc00kvfmldjmjfqizh9b4spq4xw4bskd4dny8qcpz28d")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-test-flags + `(#:cargo-test-flags ;; https://github.com/MitMaro/git-interactive-rebase-tool/issues/586 '("--release" "--" "--skip=tests::success") #:cargo-inputs @@ -1372,8 +1354,7 @@ rebase.") "0673pq96hs7waavkv58v2pakpxpsfyjvbraa5kyl2b44phgdzcid")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("clap" ,rust-clap-2) ("log" ,rust-log-0.4) ("proc-macro2" ,rust-proc-macro2-1) @@ -1402,8 +1383,7 @@ rebase.") (base32 "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-clap" ,rust-clap-3) ("rust-heck" ,rust-heck-0.4) ("rust-indexmap" ,rust-indexmap-1) @@ -1448,8 +1428,7 @@ rebase.") (base32 "1yld9fni9g9mzg4r42zfk79aq9mzm2sfzzjrrx4vir4lp4qqqwiq")))) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-heck" ,rust-heck-0.3) ("rust-indexmap" ,rust-indexmap-1) @@ -1510,8 +1489,7 @@ rebase.") "038wcjiiay825wc8inmn62flklc1adxskg5fmjhmxqnhwmj1k5gn")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-anyhow" ,rust-anyhow-1) ("rust-atty" ,rust-atty-0.2) @@ -1565,8 +1543,7 @@ of the project is to be runnable on untrusted networks without crashing.") (base32 "1q4mz2c32gfypx33zlzgd1q9h4322jrk13fzvsf8h676ylclqzpc")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-build-flags '("--release" "--features" "external-harfbuzz") + `(#:cargo-build-flags '("--release" "--features" "external-harfbuzz") #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-byte-unit" ,rust-byte-unit-4) @@ -1648,8 +1625,7 @@ of support files.") (base32 "1rarg6rffzl1cf6r167h9p14wr696kwnzr85kwbdy7x7x5zpj5li")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-console" ,rust-console-0.13) @@ -1707,8 +1683,7 @@ revert and check changes. (base32 "03x27nixdlnkkrh85gy4152arp02kpjwq0i9dn9p73lyr24s64lv")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-2) @@ -1735,8 +1710,7 @@ colorized view to stdout.") (base32 "000w549v1bpw7r57xw656p40ywf1gimvxxx5cjnri2js0xg927x4")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) ("rust-clap" ,rust-clap-2) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) @@ -1789,8 +1763,7 @@ blanks grouped by language.") (base32 "01fds6dm19bqgqydaa6n051v9l4wh9rb5d6sr9akwp2cc0fs43b7")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-colours" ,rust-ansi-colours-1) ("rust-clap" ,rust-clap-2) ("rust-dirs" ,rust-dirs-3) @@ -1838,7 +1811,6 @@ older terminal emulators.") ;; ;; (copy-file "completions/zsh" zsh) (install-file "README.md" doc))))) - #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-embed-resource" ,rust-embed-resource-1) @@ -1881,7 +1853,6 @@ runs a command whenever it detects modifications.") (substitute* "Cargo.toml" (("version = \"1.4\"") "version = \"^1\""))))) - #:tests? ,(not (%current-target-system)) #:cargo-inputs (("rust-aes" ,rust-aes-0.7) ("rust-anyhow" ,rust-anyhow-1) @@ -1954,7 +1925,6 @@ background agent taking care of maintaining the necessary state.") (build-system cargo-build-system) (arguments `(#:rust ,rust-1.64 - #:tests? ,(not (%current-target-system)) #:install-source? #f ; virtual manifest #:cargo-test-flags '("--release" "--lib" "--tests" "--" @@ -2131,8 +2101,7 @@ support for Rust.") "191d0813g4m2g1c1h8ykgrfp00blkbds6pg3zl044iyxaclng29h")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cargo" ,rust-cargo-0.69) ("rust-cargo-util" ,rust-cargo-util-0.2) @@ -2173,8 +2142,7 @@ C-compatible) software.") (base32 "1r1b6fynkjnpj5p3k209sa13mjvh4k0ghzwnribm48dh9v7lfnnv")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-memchr" ,rust-memchr-2)))) (home-page "https://github.com/Freaky/rtss") @@ -2198,8 +2166,7 @@ consecutive lines and since program start.") "1d5v9vq8frkdjm7bnw3455h6xf3c277d51il2qasn7r20kwik7ab")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-atty-0.2" ,rust-atty-0.2) ("rust-beef" ,rust-beef-0.5) ("rust-bitflags" ,rust-bitflags-1) @@ -2284,8 +2251,7 @@ consecutive lines and since program start.") (base32 "1yiyd6fml5hd2l811sckkzmiiq9bd7018ajk4qk3ai4wyvqnw8mv")))) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-2) @@ -2322,8 +2288,7 @@ consecutive lines and since program start.") "0q8slfgjfhpljzlk2myb0i538mfq99q1ljn398jm17r1q2pjjxhv")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cast" ,rust-cast-0.2) ("rust-clap" ,rust-clap-2) @@ -2357,8 +2322,7 @@ files.") (base32 "0x172ffj0lfmbv5nix708l1mfsizxzy74gpxp5amvx0bbaq0p78s")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-exitcode" ,rust-exitcode-1) ("rust-swayipc" ,rust-swayipc-2)))) (home-page "https://github.com/NomisIV/swayhide/") @@ -2441,7 +2405,6 @@ daemon which executes them.") (string-append fish "tealdeer.fish")) (copy-file "completion/zsh_tealdeer" (string-append zsh "_tealdeer")))))) - #:tests? #~(not (%current-target-system)) #:install-source? #f #:cargo-test-flags '("--release" "--" @@ -2503,8 +2466,7 @@ Full featured offline client with caching support.") (base32 "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-clap" ,rust-clap-2) ("rust-git2" ,rust-git2-0.13) @@ -2588,8 +2550,7 @@ It will then write @code{fixup!} commits for each of those changes.") (base32 "0y5v2vgl9f3n0n0w4b3iddbfyxv0hls0vw5406ry0hcvnnjyy2l3")))) (build-system cargo-build-system) (arguments - (list #:tests? #~(not (%current-target-system)) - #:cargo-inputs + (list #:cargo-inputs `(("rust-anyhow" ,rust-anyhow-1) ("rust-askama" ,rust-askama-0.11) ("rust-bincode" ,rust-bincode-1) @@ -2648,8 +2609,7 @@ to navigate to the best match.") (base32 "0912cdkz5xji1hzfj1cf42zh1kd860b52xmwwhb7q2jhp6qk25jh")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-clap" ,rust-clap-2) ("rust-html5ever" ,rust-html5ever-0.25) ("rust-kuchiki" ,rust-kuchiki-0.8) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 500116c14f..6d6733c055 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -515,8 +515,7 @@ This Guix package is built to use the nettle cryptographic library.") (native-inputs (list clang pkg-config)) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f + `(#:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-chrono" ,rust-chrono-0.4) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 7d73ba4a1c..5a9d5ed480 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -252,7 +252,6 @@ cards.") `(#:modules ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) - #:tests? ,(not (%current-target-system)) #:install-source? #f #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 56803886e3..989fd00e61 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1524,8 +1524,7 @@ basic input/output.") (base32 "1jbyxnza38c22k7ri8apzn03q91l06isj8la9xca7cz06kn0hha9")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:install-source? #f ; virtual manifest + `(#:install-source? #f ; virtual manifest #:cargo-inputs (("rust-alacritty-config" ,rust-alacritty-config-0.1) ("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.2) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 1fca31b395..f5714e934a 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -226,8 +226,7 @@ competitive (as in keystroke count) with Vim.") (sha256 "1wfv2fy5ga6kc51zka3pak0hq97csm2l11bz74w3n1hrf5q9nnf8"))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.4) ("rust-clap" ,rust-clap-2) ("rust-daemonize" ,rust-daemonize-0.4) @@ -272,8 +271,7 @@ Rust.") (file-name (git-file-name name version)))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-getopts" ,rust-getopts-0.2) ("rust-libc" ,rust-libc-0.2) ("rust-emacs" ,rust-emacs-0.11) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 3b3a99c8c8..009f2edeef 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -164,7 +164,6 @@ This package includes the @code{libtree-sitter} runtime library.") (list tree-sitter graphviz node-lts)) (arguments (list - #:tests? #~(not (%current-target-system)) #:cargo-test-flags ''("--release" "--" ;; Skip tests which rely on downloading grammar fixtures. It is diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3524aed9b2..b4dd7c27ae 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5356,8 +5356,7 @@ result in several formats: (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-aom-sys" ,rust-aom-sys-0.3) ("rust-arbitrary" ,rust-arbitrary-0.4) ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ea144fb8c1..b46286c690 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -460,8 +460,7 @@ replacing them with data URIs.") (base32 "1pj4wnsw5a4ys79sqw68ib6zimaqlkplb89x6yncg949a6hj8516")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-base64" ,rust-base64-0.13) ("rust-chrono" ,rust-chrono-0.4) @@ -1478,7 +1477,7 @@ efficiently. It gives the application developer no more than 4 methods.") "ImportTaxonomy" "ImportText" "ImportXML")) - (for-each + (for-each (lambda (directory) (copy-recursively directory (string-append perl "/../" directory))) @@ -6867,8 +6866,7 @@ file links.") (base32 "1l72r6a917ymc9pn8dllbal1xdczfai376nvqkiys5fm4j4s3zmj")))) (build-system cargo-build-system) (arguments - `(#:tests? ,(not (%current-target-system)) - #:cargo-inputs + `(#:cargo-inputs (("rust-ansi-parser" ,rust-ansi-parser-0.6) ("rust-dirs" ,rust-dirs-2) ("rust-gdk" ,rust-gdk-0.13) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 5d0800750e..912400a191 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -75,7 +75,7 @@ to NAME and VERSION." (define* (cargo-build name inputs #:key source - (tests? #f) + (tests? #t) (test-target #f) (vendor-dir "guix-vendor") (cargo-build-flags ''("--release")) -- cgit v1.2.3