From d5de9183ef8392168b06131278554e483eddfff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Mon, 7 Jun 2021 21:33:17 +0900
Subject: [PATCH] Use upstream jsonrpc again

---
 Cargo.lock           | 16 ++++++++--------
 helix-lsp/Cargo.toml |  3 +--
 shell.nix            |  6 ++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b23941fc8..9136db2ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -79,11 +79,10 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
 dependencies = [
- "autocfg",
  "cfg-if",
  "lazy_static",
 ]
@@ -429,7 +428,8 @@ dependencies = [
 [[package]]
 name = "jsonrpc-core"
 version = "17.1.0"
-source = "git+https://github.com/paritytech/jsonrpc#609d7a6cc160742d035510fa89fb424ccf077660"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e"
 dependencies = [
  "futures-util",
  "log",
@@ -803,9 +803,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
  "libc",
 ]
@@ -987,9 +987,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.17"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
index 1d74c7b8c..f4d2849f2 100644
--- a/helix-lsp/Cargo.toml
+++ b/helix-lsp/Cargo.toml
@@ -22,8 +22,7 @@ glob = "0.3"
 anyhow = "1"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-# jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", default-features = false } # don't pull in all of futures
+jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 thiserror = "1.0"
 log = "~0.4"
diff --git a/shell.nix b/shell.nix
index 9e7bce9b4..d6cb543ac 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
 
 pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
@@ -12,7 +12,9 @@ pkgs.mkShell {
   RUSTFLAGS = "-C link-arg=-fuse-ld=lld -C target-cpu=native";
   RUST_BACKTRACE = "1";
   # https://github.com/rust-lang/rust/issues/55979
-  LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
+  LD_LIBRARY_PATH = lib.makeLibraryPath (with pkgs; [
+    stdenv.cc.cc.lib
+  ]);
 
   shellHook = ''
     export HELIX_RUNTIME=$PWD/runtime