mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-18 02:44:30 +00:00
rustracer: 2.0.9 -> 2.0.12
don't hard-code RUST_SRC_PATH so it can be overwritten by users/rustup
This commit is contained in:
parent
79aee3b57d
commit
1d8f539bd4
@ -1,32 +1,33 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, rustup, substituteAll }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "racer-${version}";
|
||||
version = "2.0.9";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "racer-rust";
|
||||
repo = "racer";
|
||||
rev = version;
|
||||
sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp";
|
||||
sha256 = "0y1xlpjr8y8gsmmrjlykx4vwzf8akk42g35kg3kc419ry4fli945";
|
||||
};
|
||||
|
||||
cargoSha256 = "1w5imxyqlyv24dvzncq6dy01zn2x8p1aciyvzh8ac1x1wdjcacjc";
|
||||
cargoSha256 = "1h3jv4hajdv6k309kjr6b6298kxmd0faw081i3788sl794k9mp0j";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
# rustup is required for test
|
||||
buildInputs = [ makeWrapper rustup ];
|
||||
|
||||
preCheck = ''
|
||||
export RUST_SRC_PATH="${rustPlatform.rustcSrc}"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./rust-src.patch;
|
||||
inherit (rustPlatform) rustcSrc;
|
||||
})
|
||||
./ignore-tests.patch
|
||||
];
|
||||
doCheck = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -p target/release/racer $out/bin/
|
||||
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rustcSrc}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A utility intended to provide Rust code completion for editors and IDEs";
|
||||
homepage = https://github.com/racer-rust/racer;
|
||||
|
22
pkgs/development/tools/rust/racer/ignore-tests.patch
Normal file
22
pkgs/development/tools/rust/racer/ignore-tests.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff -Naur --strip-trailing-cr source.org/src/racer/nameres.rs source/src/racer/nameres.rs
|
||||
--- source.org/src/racer/nameres.rs 2017-11-15 20:37:38.571644733 +0000
|
||||
+++ source/src/racer/nameres.rs 2017-11-15 20:23:20.521324031 +0000
|
||||
@@ -577,6 +577,7 @@
|
||||
out.into_iter()
|
||||
}
|
||||
|
||||
+#[ignore]
|
||||
#[test]
|
||||
fn test_do_file_search() {
|
||||
let cache = core::FileCache::default();
|
||||
diff -Naur --strip-trailing-cr source.org/src/racer/util.rs source/src/racer/util.rs
|
||||
--- source.org/src/racer/util.rs 2017-11-15 19:37:55.095344120 +0000
|
||||
+++ source/src/racer/util.rs 2017-11-15 20:22:53.746624158 +0000
|
||||
@@ -475,6 +475,7 @@
|
||||
|
||||
}
|
||||
|
||||
+#[ignore]
|
||||
#[test]
|
||||
fn test_get_rust_src_path_missing() {
|
||||
use std::env;
|
10
pkgs/development/tools/rust/racer/rust-src.patch
Normal file
10
pkgs/development/tools/rust/racer/rust-src.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- source.org/src/racer/util.rs 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ source/src/racer/util.rs 2017-11-15 16:50:12.904216242 +0000
|
||||
@@ -384,6 +384,7 @@
|
||||
debug!("Nope. Trying default paths: /usr/local/src/rust/src and /usr/src/rust/src");
|
||||
|
||||
let default_paths = [
|
||||
+ "@rustcSrc@",
|
||||
"/usr/local/src/rust/src",
|
||||
"/usr/src/rust/src",
|
||||
];
|
Loading…
Reference in New Issue
Block a user