From e84e223c9b44dfc7b86bbee5ae2e73c02ab06fa4 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 27 Jul 2019 22:35:44 -0700 Subject: [PATCH 1/2] rls: 1.35.0 -> 1.36.0 --- pkgs/development/tools/rust/rls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index 0427eadea19..22374d2bbe7 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rls"; # with rust 1.x you can only build rls version 1.x.y - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "rust-lang"; repo = pname; rev = version; - sha256 = "1l3fvlgfzri8954nbwqxqghjy5wa8p1aiml12r1lqs92dh0g192f"; + sha256 = "1mclv0admxv48pndyqghxc4nf1amhbd700cgrzjshf9jrnffxmrn"; }; - cargoSha256 = "0v96ndys6bv5dfjg01chrqrqjc57qqfjw40n6vppi9bpw0f6wkf5"; + cargoSha256 = "1yli9540510xmzqnzfi3p6rh23bjqsviflqw95a0fawf2rnj8sin"; # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; From 40020f46b6b64cd0de9e18dc01051a09438eb00d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 24 Jun 2019 15:44:15 -0700 Subject: [PATCH 2/2] rls: fix darwin build rls links to internal rustc crates, which introduces an atypical dependency on rustc. A superficial installCheck ensures that the binary is linked properly and able to run on its own. --- pkgs/development/tools/rust/rls/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/rust/rls/default.nix b/pkgs/development/tools/rust/rls/default.nix index 22374d2bbe7..454c5da7143 100644 --- a/pkgs/development/tools/rust/rls/default.nix +++ b/pkgs/development/tools/rust/rls/default.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { # a nightly compiler is required unless we use this cheat code. RUSTC_BOOTSTRAP=1; + # rls-rustc links to rustc_private crates + CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ openssh openssl curl zlib libiconv ] ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]); @@ -29,6 +32,11 @@ rustPlatform.buildRustPackage rec { rm tests/client.rs ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/rls --version + ''; + 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/;