From 28aa1f987c847164227aea20cdc39b6cefc87479 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 19 Oct 2021 19:15:31 -0400 Subject: [PATCH] rustracerd: remove --- pkgs/development/tools/misc/ycmd/default.nix | 5 --- .../development/tools/rust/racerd/default.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 --- 4 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/development/tools/rust/racerd/default.nix diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index cf4fe39754f..6779c096d39 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -3,7 +3,6 @@ , godef ? null , gotools ? null , nodePackages ? null -, rustracerd ? null , fixDarwinDylibNames, Cocoa ? null }: @@ -74,10 +73,6 @@ stdenv.mkDerivation { '' + lib.optionalString (nodePackages != null) '' TARGET=$out/lib/ycmd/third_party/tsserver ln -sf ${nodePackages.typescript} $TARGET - '' + lib.optionalString (rustracerd != null) '' - TARGET=$out/lib/ycmd/third_party/racerd/target/release - mkdir -p $TARGET - ln -sf ${rustracerd}/bin/racerd $TARGET ''; # fixup the argv[0] and replace __file__ with the corresponding path so diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix deleted file mode 100644 index 6ffa49aa6b9..00000000000 --- a/pkgs/development/tools/rust/racerd/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }: - -rustPlatform.buildRustPackage rec { - pname = "racerd"; - version = "unstable-2019-09-02"; - - src = fetchFromGitHub { - owner = "jwilm"; - repo = "racerd"; - rev = "e3d380b9a1d3f3b67286d60465746bc89fea9098"; - sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln"; - }; - - cargoPatches = [ - (fetchpatch { - url = "https://github.com/jwilm/racerd/commit/856f3656e160cd2909c5166e962f422c901720ee.patch"; - sha256 = "1qq2k4bnwjz5qgn7s8yxd090smwn2wvdm8dd1rrlgpln0a5vxkpb"; - }) - ]; - - cargoSha256 = "08zn65c5ivhn2qs02aiixyqwhywrw8kfvs0kgzxdzsipic47n2qq"; - - # a nightly compiler is required unless we use this cheat code. - RUSTC_BOOTSTRAP=1; - - doCheck = false; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin Security; - - RUST_SRC_PATH = rustPlatform.rustcSrc; - - installPhase = '' - mkdir -p $out/bin - cp -p $releaseDir/racerd $out/bin/ - wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" - ''; - - meta = with lib; { - broken = true; - description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs"; - homepage = "https://github.com/jwilm/racerd"; - license = licenses.asl20; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 128ee0312cd..4bff70b0c8b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -807,6 +807,7 @@ mapAliases ({ runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 + rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # added 2021-10-19 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a92efb79584..50e403c9a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12734,9 +12734,6 @@ with pkgs; rustracer = callPackage ../development/tools/rust/racer { inherit (darwin.apple_sdk.frameworks) Security; }; - rustracerd = callPackage ../development/tools/rust/racerd { - inherit (darwin.apple_sdk.frameworks) Security; - }; rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -15278,8 +15275,6 @@ with pkgs; ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; python = python3; - # currently broken - rustracerd = null; }; yodl = callPackage ../development/tools/misc/yodl { };