diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
| commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
| tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/development/tools/rust/rust-analyzer | |
| parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
| parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
| download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip | |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/development/tools/rust/rust-analyzer')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 7eccf4d0c378..43bf5415ce01 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-04-20"; + rev = "2020-06-01"; version = "unstable-${rev}"; - sha256 = "00v8b6pbm5fry6bfkrfd7phn0ps8annqrw9k71m3pd26sxnn1q5f"; - cargoSha256 = "0nd86gwlfjwdkcphpk8zvs95xxdm8p74wl7vcrx8fnvvfxnkpwmc"; + sha256 = "0chm47mrd4hybhvzn4cndq2ck0mj948mm181p1i1j1w0ms7zk1fg"; + cargoSha256 = "0yaz50f7hirlcs8bxc5dh170lch9l1gscwayan71k3pz23wkvlzs"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index de755ec17ff5..ae6ad80cdd9a 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - preBuild = "pushd crates/rust-analyzer"; - # Do not checking other crates in checkPhase. - preInstall = "popd"; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; |