diff options
| author | Distopico <distopico@riseup.net> | 2023-08-30 14:58:14 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-09-09 15:54:38 +0200 |
| commit | a4514556df4e3138544def7286c6ecf640634a57 (patch) | |
| tree | 3e2d2897accaf0e45e303641f60370cc968ebdf8 /gnu/packages/rust-apps.scm | |
| parent | 58fe4574a97046ffb3b015034a50119ffc04792d (diff) | |
gnu: rust-analyzer: Fix build of version 2022-01-10.
* gnu/packages/rust-apps.scm (rust-analyzer): Update dependency
rust-notify-5-pre.13.
This fixes the build of `rust-analyzer@2022-01-10`, which required a pinned
version of `rust-notify` (`rust-notify-5-pre.13`) to compile and
rust >= 1.64.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/rust-apps.scm')
| -rw-r--r-- | gnu/packages/rust-apps.scm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index a291282325..8c7d8006cc 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1780,9 +1780,10 @@ background agent taking care of maintaining the necessary state.") "1ci85bp8xwqrk8nqr8sh6yj8njgd98nhgnhaks2g00c77wwyra41")))) (build-system cargo-build-system) (arguments - `(#:install-source? #f ; virtual manifest + `(#:rust ,rust-1.64 + #:install-source? #f ; virtual manifest #:cargo-test-flags - '("--release" "--" + '("--release" "--lib" "--tests" "--" "--skip=tests::test_version_check" ;it need rustc's version ;; FIXME: Guix's rust does not install source in ;; %out/lib/rustlib/src/rust so "can't load standard library from @@ -1793,12 +1794,19 @@ background agent taking care of maintaining the necessary state.") "--skip=tests::sourcegen::sourcegen_assists_docs" ;need rustfmt "--skip=tests::sourcegen_ast::sourcegen_ast" ;same - "--skip=tidy::cargo_files_are_tidy" ;not needed "--skip=tidy::check_licenses" ;it runs cargo metadata "--skip=tidy::check_merge_commits" ;it runs git rev-list "--skip=tidy::check_code_formatting" ;need rustfmt as cargo fmt - "--skip=tidy::generate_grammar" ;same - "--skip=tidy::generate_assists_tests") ;same + + ;; These tests require rust <= 1.60 and too many packages + ;; has as dependency rust-serde-json-1 that use indexmap2 + ;; and it need rust >= 1.64 + "--skip=tests::list_test_macros" + "--skip=tests::test_derive_empty" + "--skip=tests::test_attr_macro" + "--skip=tests::test_fn_like_macro" + "--skip=tests::test_fn_like_macro2" + "--skip=tests::test_derive_error") #:cargo-development-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) @@ -1845,7 +1853,7 @@ background agent taking care of maintaining the necessary state.") ("rust-memmap2" ,rust-memmap2-0.5) ("rust-mimalloc" ,rust-mimalloc-0.1) ("rust-miow" ,rust-miow-0.4) - ("rust-notify" ,rust-notify-5) + ("rust-notify" ,rust-notify-5-pre.13) ("rust-object" ,rust-object-0.28) ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.11) @@ -1927,7 +1935,7 @@ exec -a \"$0\" \"~a\" \"$@\"" (chdir "../..") (install-file "LICENSE-MIT" doc) (install-file "LICENSE-APACHE" doc))))))) - (native-inputs (list rust-src)) + (native-inputs (list rust-src-1.64)) (home-page "https://rust-analyzer.github.io/") (synopsis "Experimental Rust compiler front-end for IDEs") (description "Rust-analyzer is a modular compiler frontend for the Rust |