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/packages/python-crypto.scm') 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/packages/python-crypto.scm') 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/packages/python-crypto.scm') 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 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/packages/python-crypto.scm') 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 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/packages/python-crypto.scm') 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 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/packages/python-crypto.scm') 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