jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rls: 1.34 -> 1.35 (#65241)

Browse Source 
rls: 1.34 -> 1.35
This commit is contained in:
Vladyslav M 2019-07-22 22:22:56 +03:00 committed by GitHub
commit 6bec1fa33d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/tools/rust/rls/default.nix
View File

@ -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;
};

4
pkgs/top-level/all-packages.nix
View File

@ -8122,7 +8122,9 @@ in
pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };
rainicorn = callPackage ../development/tools/rust/rainicorn { };
rls = callPackage ../development/tools/rust/rls { };
rls = callPackage ../development/tools/rust/rls {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
rustfmt = callPackage ../development/tools/rust/rustfmt { };
rustracer = callPackage ../development/tools/rust/racer { };
rustracerd = callPackage ../development/tools/rust/racerd { };