mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 12:53:59 +03:00
commit
6a0f1080a1
@ -1,19 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform
|
||||
, openssh, openssl, pkgconfig, cmake, zlib, curl }:
|
||||
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "rls-${version}";
|
||||
# with rust 1.x you can only build rls version 1.x.y
|
||||
version = "1.31.7";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rls";
|
||||
rev = version;
|
||||
sha256 = "0n33pf7sm31y55rllb8wv3mn75srspr4yj2y6cpcdyf15n47c8cf";
|
||||
rev = "0d6f53e1a4adbaf7d83cdc0cb54720203fcb522e";
|
||||
sha256 = "1aabs0kr87sp68n9893im5wz21dicip9ixir9a9l56nis4qxpm7i";
|
||||
};
|
||||
|
||||
cargoSha256 = "0jcsggq4ay8f4vb8n6gh8z995icvvbjkzapxf6jq6qkg6jp3vv17";
|
||||
cargoSha256 = "16r9rmjhb0dbdgx9qf740nsckjazz4z663vaajw5z9i4qh0jsy18";
|
||||
|
||||
# a nightly compiler is required unless we use this cheat code.
|
||||
RUSTC_BOOTSTRAP=1;
|
||||
@ -22,12 +22,16 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoBuildFlags = [ "--no-default-features" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ openssh openssl curl zlib ];
|
||||
buildInputs = [ openssh openssl curl zlib libiconv ];
|
||||
|
||||
doCheck = true;
|
||||
# the default checkPhase has no way to pass --no-default-features
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# client tests are flaky
|
||||
rm tests/client.rs
|
||||
|
||||
echo "Running cargo test"
|
||||
cargo test --no-default-features
|
||||
runHook postCheck
|
||||
|
Loading…
Reference in New Issue
Block a user