diff options
author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-07-21 22:29:40 +0200 |
---|---|---|
committer | Vladyslav M <dywedir@gra.red> | 2019-07-22 17:42:18 +0300 |
commit | 7ed3d2d6fd130b8c8beede5cf1f44c3f63c71f88 (patch) | |
tree | e80f2c5bca694b8eda1c2af51b102ea81cff521c /pkgs/development/tools/rust | |
parent | 95be462d07043feb710f587eaf09a006d5fb438d (diff) |
rls: 1.34 -> 1.35
Diffstat (limited to 'pkgs/development/tools/rust')
-rw-r--r-- | pkgs/development/tools/rust/rls/default.nix | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index f52ab0d767a31..0427eadea1958 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -1,46 +1,38 @@ { stdenv, fetchFromGitHub, rustPlatform -, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv }: +, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv +, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { - name = "rls-${version}"; + pname = "rls"; # with rust 1.x you can only build rls version 1.x.y - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "rust-lang"; - repo = "rls"; - rev = "0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e"; - sha256 = "1aabs0kr87sp68n9893im5wz21dicip9ixir9a9l56nis4qxpm7i"; + repo = pname; + rev = version; + sha256 = "1l3fvlgfzri8954nbwqxqghjy5wa8p1aiml12r1lqs92dh0g192f"; }; - cargoSha256 = "16r9rmjhb0dbdgx9qf740nsckjazz4z663vaajw5z9i4qh0jsy18"; + cargoSha256 = "0v96ndys6bv5dfjg01chrqrqjc57qqfjw40n6vppi9bpw0f6wkf5"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; - # clippy is hard to build with stable rust so we disable clippy lints - cargoBuildFlags = [ "--no-default-features" ]; - nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ openssh openssl curl zlib libiconv ]; + buildInputs = [ openssh openssl curl zlib libiconv ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); doCheck = true; - # the default checkPhase has no way to pass --no-default-features - checkPhase = '' - runHook preCheck - + preCheck = '' # client tests are flaky rm tests/client.rs - - echo "Running cargo test" - cargo test --no-default-features - runHook postCheck ''; meta = with stdenv.lib; { description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; homepage = https://github.com/rust-lang/rls/; - license = licenses.mit; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ symphorien ]; platforms = platforms.all; }; |