From 0e49168cc641ec4dca88d0054d615437396f8ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 6 Oct 2019 09:39:21 +0200 Subject: [PATCH 1/2] rustracer: 2.1.22 -> 2.1.27 Fixes failing build on master. --- pkgs/development/tools/rust/racer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index a06723fc28c8..63ab48713da5 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.22"; + version = "2.1.27"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "1n808h4jqxkvpjwmj8jgi4y5is5zvr8vn42mwb3yi13mix32cysa"; + sha256 = "1ajj515ck5n0mzig77xnq1qgb2s4gf6ahgd5mab91406jvij9qf3"; }; - cargoSha256 = "0njaa9vk2i9g1c6sq20b7ls97nl532rfv3is7d8dwz51nrwk6jxs"; + cargoSha256 = "0ki5j5gh59c92a0w43kzljpiamv2jvyk4m2w8qldfyl5kaa40dxb"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { --skip util::test_get_rust_src_path_not_rust_source_tree \ --skip extern --skip completes_pub_fn --skip find_crate_doc \ --skip follows_use_local_package --skip follows_use_for_reexport \ - --skip follows_rand_crate --skip get_completion_in_example_dir + --skip follows_rand_crate --skip get_completion_in_example_dir \ + --skip test_resolve_global_path_in_modules ''; doInstallCheck = true; From 36164541c5c9d2671b6ae31eb4e3f737d403405b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 6 Oct 2019 09:56:55 +0200 Subject: [PATCH 2/2] rustracer: fix default RUST_SRC_PATH --- pkgs/development/tools/rust/racer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 63ab48713da5..65d3006a3b86 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = rustPlatform.rustcSrc; postInstall = '' - wrapProgram $out/bin/racer --set-default RUST_SRC_PATH $rustcSrc + wrapProgram $out/bin/racer --set-default RUST_SRC_PATH ${rustPlatform.rustcSrc} ''; checkPhase = ''