From 6353f88074409cc53c5cc1ea2021d4b69445efd2 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Mon, 16 Aug 2021 15:24:02 +0800
Subject: rust-analyzer: 2021-08-09 -> 2021-08-16

Note that upstream replaced `rollup` with `esbuild` now.
---
 pkgs/development/tools/rust/rust-analyzer/default.nix             | 6 +++---
 pkgs/development/tools/rust/rust-analyzer/update.sh               | 6 ++----
 pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json | 7 +++----
 pkgs/misc/vscode-extensions/rust-analyzer/default.nix             | 5 +++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 915dad400b4..1700fd14b3a 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -7,14 +7,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2021-08-09";
-  cargoSha256 = "sha256-r01riAztIlwxRjvqQXofmqv5875nqQ0Qb9KALvKy4u8=";
+  version = "2021-08-16";
+  cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk=";
 
   src = fetchFromGitHub {
     owner = "rust-analyzer";
     repo = "rust-analyzer";
     rev = version;
-    sha256 = "sha256-l9F/cznYHxBdnb3NerIXzOMrzRnxdka0vExzUtKkBfw=";
+    sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE=";
   };
 
   buildAndTestSubdir = "crates/rust-analyzer";
diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh
index 91bde976ebd..add400e4d0e 100755
--- a/pkgs/development/tools/rust/rust-analyzer/update.sh
+++ b/pkgs/development/tools/rust/rust-analyzer/update.sh
@@ -53,13 +53,11 @@ echo "Extension version: $extension_ver"
 
 build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
 # We need devDependencies to build vsix.
-jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
+# `esbuild` is a binary package an is already in nixpkgs so we omit it here.
+jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \
     --arg ver "$extension_ver" \
     >"$build_deps/package.json.new"
 
-# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195
-sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new"
-
 old_deps="$(jq '.dependencies' "$build_deps"/package.json)"
 new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)"
 if [[ "$old_deps" == "$new_deps" ]]; then
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
index 1e69d9e81ba..a98102c36b0 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -1,12 +1,12 @@
 {
   "name": "rust-analyzer",
-  "version": "0.2.702",
+  "version": "0.2.710",
   "dependencies": {
     "https-proxy-agent": "^5.0.0",
     "node-fetch": "^2.6.1",
     "vscode-languageclient": "^7.1.0-next.5",
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
+    "d3": "^7.0.0",
+    "d3-graphviz": "^4.0.0",
     "@types/glob": "^7.1.4",
     "@types/mocha": "^8.2.3",
     "@types/node": "~14.17.5",
@@ -17,7 +17,6 @@
     "eslint": "^7.30.0",
     "glob": "^7.1.6",
     "mocha": "^9.0.2",
-    "rollup": "=2.51.1",
     "tslib": "^2.3.0",
     "typescript": "^4.3.5",
     "typescript-formatter": "^7.2.2",
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
index 479f9f4c6ea..82491389791 100644
--- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
@@ -4,8 +4,9 @@
 , jq
 , rust-analyzer
 , nodePackages
-, setDefaultServerPath ? true
 , moreutils
+, esbuild
+, setDefaultServerPath ? true
 }:
 
 let
@@ -21,7 +22,7 @@ let
 
     releaseTag = rust-analyzer.version;
 
-    nativeBuildInputs = [ jq moreutils ];
+    nativeBuildInputs = [ jq moreutils esbuild ];
 
     # Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
     postInstall = ''
-- 
cgit 1.4.1