Unverified Commit d47039cd authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #322597 from tomodachi94/drop/vscode-css-json-html-languageserver-bin

parents 3c89ee1b 5912dfd1

nixos/doc/manual/release-notes/rl-2411.section.md

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ 


- Android NDK version 26 and SDK version 33 are now the default versions used for cross compilation to android.



- `nodePackages.vscode-css-languageserver-bin`, `nodePackages.vscode-html-languageserver-bin`,

  and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream.

  The `vscode-langservers-extracted` package is a maintained drop-in replacement.



- `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the

  output by default, to alert users to closure size issues caused by

  [#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging

pkgs/development/node-packages/aliases.nix

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ mapAliases { 
  inherit (pkgs) ungit; # added 2023-08-20

  inherit (pkgs) vim-language-server; # added 2024-06-25

  inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30

  vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26

  vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26

  vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26

  vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27

  vue-cli = self."@vue/cli"; # added 2023-08-18

  vue-language-server = self.vls; # added 2023-08-20

pkgs/development/node-packages/main-programs.nix

+0 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 
  typescript-language-server = "typescript-language-server";

  uglify-js = "uglifyjs";

  undollar = "$";

  vscode-css-languageserver-bin = "css-languageserver";

  vscode-html-languageserver-bin = "html-languageserver";

  vscode-json-languageserver-bin = "json-languageserver";

  vscode-json-languageserver = "vscode-json-languageserver";

  webtorrent-cli = "webtorrent";

}

pkgs/development/node-packages/node-packages.json

+0 −3
Original line number Diff line number Diff line
@@ -257,10 +257,7 @@ 
, "vega-lite"

, "vercel"

, "vls"

, "vscode-css-languageserver-bin"

, "vscode-html-languageserver-bin"

, "vscode-json-languageserver"

, "vscode-json-languageserver-bin"

, "wavedrom-cli"

, "webpack"

, "webpack-cli"

pkgs/development/node-packages/node-packages.nix

+0 −117
Original line number Diff line number Diff line
@@ -91186,72 +91186,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  vscode-css-languageserver-bin = nodeEnv.buildNodePackage {

    name = "vscode-css-languageserver-bin";

    packageName = "vscode-css-languageserver-bin";

    version = "1.4.0";

    src = fetchurl {

      url = "https://registry.npmjs.org/vscode-css-languageserver-bin/-/vscode-css-languageserver-bin-1.4.0.tgz";

      sha512 = "KWrF5f4RYYe8RBDfqb1c0Sdf9xPS2Ly/Z/T18H+uUOMw2QyzIrkxv4bMKy5GFfPm4479k6Ln4ji4UHqSmhGf3g==";

    };

    dependencies = [

      sources."vscode-css-languageservice-3.0.13"

      sources."vscode-jsonrpc-8.2.0"

      sources."vscode-languageserver-4.4.2"

      sources."vscode-languageserver-protocol-3.17.5"

      sources."vscode-languageserver-protocol-foldingprovider-2.0.1"

      sources."vscode-languageserver-types-3.17.5"

      sources."vscode-nls-4.1.2"

      sources."vscode-uri-1.0.8"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "Binary version published on npm of vscode-css-languageserver extracted from VSCode tree";

      homepage = "https://github.com/vscode-langservers/vscode-css-languageserver-bin#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  vscode-html-languageserver-bin = nodeEnv.buildNodePackage {

    name = "vscode-html-languageserver-bin";

    packageName = "vscode-html-languageserver-bin";

    version = "1.4.0";

    src = fetchurl {

      url = "https://registry.npmjs.org/vscode-html-languageserver-bin/-/vscode-html-languageserver-bin-1.4.0.tgz";

      sha512 = "rDnpvASQwf1dlRaGiu8edo5WlAr4dM3/r/dcPCH4O6UD4+eShhdC1E8IyiSisnJU6bRk+4mDTCgA6cyhGJY2xA==";

    };

    dependencies = [

      sources."typescript-2.9.2"

      (sources."vscode-css-languageservice-3.0.13" // {

        dependencies = [

          sources."vscode-nls-4.1.2"

        ];

      })

      (sources."vscode-html-languageservice-2.1.12" // {

        dependencies = [

          sources."vscode-nls-4.1.2"

        ];

      })

      sources."vscode-jsonrpc-8.2.0"

      sources."vscode-languageserver-4.4.2"

      sources."vscode-languageserver-protocol-3.17.5"

      sources."vscode-languageserver-protocol-foldingprovider-2.0.1"

      sources."vscode-languageserver-types-3.17.5"

      sources."vscode-nls-3.2.5"

      sources."vscode-uri-1.0.8"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "Binary version published on npm of vscode-html-languageserver extracted from VSCode tree";

      homepage = "https://github.com/vscode-langservers/vscode-html-languageserver-bin#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  vscode-json-languageserver = nodeEnv.buildNodePackage {

    name = "vscode-json-languageserver";

    packageName = "vscode-json-languageserver";
@@ -91296,57 +91230,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  vscode-json-languageserver-bin = nodeEnv.buildNodePackage {

    name = "vscode-json-languageserver-bin";

    packageName = "vscode-json-languageserver-bin";

    version = "1.0.1";

    src = fetchurl {

      url = "https://registry.npmjs.org/vscode-json-languageserver-bin/-/vscode-json-languageserver-bin-1.0.1.tgz";

      sha512 = "WU+Ks0OEo1c4pgFUA4gIockhzlRqWqSRL2NXHOCtYhJnuIqfrNgSyECZC+nCMyn/CnzpPuQQjzC74GWlIRXnZQ==";

    };

    dependencies = [

      sources."agent-base-4.3.0"

      sources."debug-3.1.0"

      sources."es6-promise-4.2.8"

      sources."es6-promisify-5.0.0"

      sources."http-proxy-agent-2.1.0"

      sources."https-proxy-agent-2.2.4"

      sources."jsonc-parser-1.0.3"

      sources."ms-2.0.0"

      (sources."request-light-0.2.5" // {

        dependencies = [

          sources."vscode-nls-4.1.2"

        ];

      })

      (sources."vscode-json-languageservice-3.11.0" // {

        dependencies = [

          sources."jsonc-parser-3.2.1"

          sources."vscode-nls-5.2.0"

          sources."vscode-uri-2.1.2"

        ];

      })

      sources."vscode-jsonrpc-3.5.0"

      sources."vscode-languageserver-3.5.1"

      (sources."vscode-languageserver-protocol-3.5.1" // {

        dependencies = [

          sources."vscode-languageserver-types-3.5.0"

        ];

      })

      sources."vscode-languageserver-textdocument-1.0.11"

      sources."vscode-languageserver-types-3.16.0-next.2"

      sources."vscode-nls-2.0.2"

      sources."vscode-uri-1.0.8"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "JSON language server";

      homepage = "https://github.com/vscode-langservers/vscode-json-languageserver-bin#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  wavedrom-cli = nodeEnv.buildNodePackage {

    name = "wavedrom-cli";

    packageName = "wavedrom-cli";