diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-22 14:27:55 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-24 02:03:12 +0100 |
| commit | 01cef16f8594956a06824751f5f2a0be8b823627 (patch) | |
| tree | 2adec0f05b0df7ced79597f53d76f44115ad15c9 /gnu/packages/rust.scm | |
| parent | 52b24ba495d674946587419c58192d940f13be4a (diff) | |
| download | guix-01cef16f8594956a06824751f5f2a0be8b823627.tar.gz | |
gnu: rust: Don't depend on 'git'.
* gnu/packages/rust.scm (rust-1.19)[inputs]: Remove GIT. (rust-1.20)[arguments]: Disable Cargo tests that require git. (rust-1.26)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/rust.scm')
| -rw-r--r-- | gnu/packages/rust.scm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a56faad079..8618c37761 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control) #:use-module (gnu packages) #:use-module (guix build-system cargo) #:use-module (guix build-system gnu) @@ -387,7 +386,6 @@ test = { path = \"../libtest\" } ("cmake" ,cmake) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests - ("git" ,git) ("procps" ,procps) ; For the tests ("python-2" ,python-2) ("rustc-bootstrap" ,mrustc) @@ -446,6 +444,13 @@ safety and thread safety guarantees.") ;; i686-linux. (substitute* "src/tools/cargo/tests/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; These tests pull in a dependency on "git", which changes + ;; too frequently take part in the Rust toolchain. + (substitute* "src/tools/cargo/tests/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")) #t)) (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test ;; https://github.com/rust-lang/rust/issues/47863 @@ -678,6 +683,12 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; i686-linux. (substitute* "src/tools/cargo/tests/testsuite/test.rs" (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + + ;; Avoid dependency on "git". + (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")) #t)) (add-after 'patch-cargo-tests 'disable-cargo-test-for-nightly-channel (lambda* _ |