git.iko.soy/helix
on master help sign in
Use upstream jsonrpc again
commitd5de9183ef8392168b06131278554e483eddfff3 authorBlaž Hrastnik <blaz@mxxn.io> dateMon 7 Jun 2021, 21:33 (5 years ago) parent8d6fad4
3 files changed+13−12
compare with master
unifiedsplit
Cargo.lock+8−8 helix-lsp/Cargo.toml+1−2 shell.nix+4−2
Cargo.lock+8−8
@@ -79,11 +79,10 @@ dependencies = [
7979
8080[[package]]
8181name = "crossbeam-utils"
82−version = "0.8.4"
82+version = "0.8.5"
8383source = "registry+https://github.com/rust-lang/crates.io-index"
84−checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
84+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
8585dependencies = [
86− "autocfg",
8786 "cfg-if",
8887 "lazy_static",
8988]
@@ -429,7 +428,8 @@ dependencies = [
429428[[package]]
430429name = "jsonrpc-core"
431430version = "17.1.0"
432−source = "git+https://github.com/paritytech/jsonrpc#609d7a6cc160742d035510fa89fb424ccf077660"
431+source = "registry+https://github.com/rust-lang/crates.io-index"
432+checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e"
433433dependencies = [
434434 "futures-util",
435435 "log",
@@ -803,9 +803,9 @@ dependencies = [
803803
804804[[package]]
805805name = "signal-hook-registry"
806−version = "1.3.0"
806+version = "1.4.0"
807807source = "registry+https://github.com/rust-lang/crates.io-index"
808−checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
808+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
809809dependencies = [
810810 "libc",
811811]
@@ -987,9 +987,9 @@ dependencies = [
987987
988988[[package]]
989989name = "unicode-normalization"
990−version = "0.1.17"
990+version = "0.1.19"
991991source = "registry+https://github.com/rust-lang/crates.io-index"
992−checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
992+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
993993dependencies = [
994994 "tinyvec",
995995]
helix-lsp/Cargo.toml+1−2
@@ -22,8 +22,7 @@ glob = "0.3"
2222anyhow = "1"
2323serde_json = "1.0"
2424serde = { version = "1.0", features = ["derive"] }
25−# jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
26−jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", default-features = false } # don't pull in all of futures
25+jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
2726futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
2827thiserror = "1.0"
2928log = "~0.4"
shell.nix+4−2
@@ -1,4 +1,4 @@
1−{ stdenv, pkgs }:
1+{ lib, stdenv, pkgs }:
22
33pkgs.mkShell {
44 nativeBuildInputs = with pkgs; [
@@ -12,7 +12,9 @@ pkgs.mkShell {
1212 RUSTFLAGS = "-C link-arg=-fuse-ld=lld -C target-cpu=native";
1313 RUST_BACKTRACE = "1";
1414 # https://github.com/rust-lang/rust/issues/55979
15− LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
15+ LD_LIBRARY_PATH = lib.makeLibraryPath (with pkgs; [
16+ stdenv.cc.cc.lib
17+ ]);
1618
1719 shellHook = ''
1820 export HELIX_RUNTIME=$PWD/runtime