Unverified Commit 9318c640 authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #327313 from dotlambda/nodePackages 

nodePackages: some cleanup
parents e359d268 635ee0ff

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ mapAliases { 
  inherit (pkgs) get-graphql-schema; # added 2024-06-26

  inherit (pkgs) gqlint; # added 2023-08-19

  inherit (pkgs) gramma; # added 2024-06-26

  grammarly-languageserver = throw "grammarly-languageserver was removed because it requires EOL Node.js 16"; # added 2024-07-15

  inherit (pkgs) graphite-cli; # added 2024-01-25

  inherit (pkgs) graphqurl; # added 2023-08-19

  gtop = pkgs.gtop; # added 2023-07-31

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

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ 
, "ganache"

, "gatsby-cli"

, "@gitbeaker/cli"

, "grammarly-languageserver"

, "graphql"

, "graphql-cli"

, "graphql-language-service-cli"

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

+0 −44
Original line number Diff line number Diff line
@@ -71874,50 +71874,6 @@ in 
    bypassCache = true;

    reconstructLock = true;

  };

  grammarly-languageserver = nodeEnv.buildNodePackage {

    name = "grammarly-languageserver";

    packageName = "grammarly-languageserver";

    version = "0.0.4";

    src = fetchurl {

      url = "https://registry.npmjs.org/grammarly-languageserver/-/grammarly-languageserver-0.0.4.tgz";

      sha512 = "+PbI/pMgAeoa0jbFI65JWRj3RjomHjvigrKZybXCYM3jlvTDKUyg7NWPug554ukKLaGIURQ1YGOptmfrYOMzQw==";

    };

    dependencies = [

      sources."@grammarly/sdk-1.11.0"

      sources."dom-serializer-2.0.0"

      sources."domelementtype-2.3.0"

      sources."domhandler-5.0.3"

      sources."domutils-3.1.0"

      sources."encoding-0.1.13"

      sources."entities-4.5.0"

      sources."grammarly-richtext-encoder-0.0.0"

      sources."htmlparser2-8.0.2"

      sources."iconv-lite-0.6.3"

      sources."idb-keyval-6.2.1"

      sources."inversify-6.0.2"

      sources."node-fetch-2.7.0"

      sources."reflect-metadata-0.1.14"

      sources."safer-buffer-2.1.2"

      sources."tr46-0.0.3"

      sources."vscode-jsonrpc-6.0.0"

      sources."vscode-languageserver-7.0.0"

      sources."vscode-languageserver-protocol-3.16.0"

      sources."vscode-languageserver-textdocument-1.0.11"

      sources."vscode-languageserver-types-3.16.0"

      sources."web-tree-sitter-0.20.5"

      sources."webidl-conversions-3.0.1"

      sources."whatwg-url-5.0.0"

    ];

    buildInputs = globalBuildInputs;

    meta = {

      description = "LSP server implementation for Grammarly";

      homepage = "https://github.com/znck/grammarly#readme";

      license = "MIT";

    };

    production = true;

    bypassCache = true;

    reconstructLock = true;

  };

  graphql = nodeEnv.buildNodePackage {

    name = "graphql";

    packageName = "graphql";

pkgs/development/node-packages/overrides.nix

+5 −8
Original line number Diff line number Diff line
@@ -61,14 +61,6 @@ final: prev: { 
    '';

  };



  grammarly-languageserver = prev.grammarly-languageserver.override (old: {

    meta = old.meta // {

      # requires EOL Node.js 16

      # https://github.com/znck/grammarly/issues/334

      broken = true;

    };

  });



  graphql-language-service-cli = prev.graphql-language-service-cli.override {

    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];

    postInstall = ''
@@ -129,6 +121,11 @@ final: prev: { 
        };

      }

    ] ++ oldAttrs.dependencies;



    meta = oldAttrs.meta // {

      # ModuleNotFoundError: No module named 'distutils'

      broken = true;

    };

  });



  jsonplaceholder = prev.jsonplaceholder.override {