Merge pull request #190028 from symphorien/remove-rls

rls: remove

pkgs/development/compilers/rust/default.nix

@@ -83,7 +83,6 @@ in
         inherit CoreFoundation Security;
       };
       clippy = self.callPackage ./clippy.nix { inherit Security; };
-      rls = self.callPackage ./rls { inherit CoreFoundation Security SystemConfiguration; };
     });
   };
 }

pkgs/development/compilers/rust/rls/default.nix

@@ -1,53 +0,0 @@
-{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform
-, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
-, CoreFoundation, Security, SystemConfiguration }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rls";
-  inherit (rustPlatform.rust.rustc) src version;
-
-  # changes hash of vendor directory otherwise
-  dontUpdateAutotoolsGnuConfigScripts = true;
-
-  cargoVendorDir = "vendor";
-  buildAndTestSubdir = "src/tools/rls";
-
-  preBuild = ''
-    # client tests are flaky
-    rm ${buildAndTestSubdir}/tests/client.rs
-  '';
-
-  # a nightly compiler is required unless we use this cheat code.
-  RUSTC_BOOTSTRAP=1;
-
-  # As of rustc 1.45.0, these env vars are required to build rls
-  # (due to https://github.com/rust-lang/rust/pull/72001)
-  CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly";
-  CFG_RELEASE_CHANNEL = "nightly";
-
-  # rls-rustc links to rustc_private crates
-  CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
-
-  nativeBuildInputs = [ pkg-config cmake makeWrapper ];
-  buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]
-    ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security SystemConfiguration ];
-
-  doCheck = true;
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    $out/bin/rls --version
-  '';
-
-  RUST_SRC_PATH = rustPlatform.rustLibSrc;
-  postInstall = ''
-    wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc}
-  '';
-
-  meta = with lib; {
-    description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
-    homepage = "https://github.com/rust-lang/rls/";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ symphorien ];
-  };
-}

pkgs/top-level/aliases.nix

@@ -1245,6 +1245,7 @@ mapAliases ({
   rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15
   ring-daemon = jami-daemon; # Added 2021-10-26
   rkt = throw "rkt was archived by upstream"; # Added 2020-05-16
+  rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06
   rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22
   robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22
   rockbox_utility = rockbox-utility; # Added 2022-03-17

pkgs/top-level/all-packages.nix

@@ -14627,7 +14627,6 @@ with pkgs;
   ograc = callPackage ../development/tools/rust/ograc { };
 
   rhack = callPackage ../development/tools/rust/rhack { };
-  inherit (rustPackages) rls;
   roogle = callPackage ../development/tools/rust/roogle { };
   rustfmt = rustPackages.rustfmt;
   rustracer = callPackage ../development/tools/rust/racer {