summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--user/packages/node2nix/node-packages.json2
-rw-r--r--user/packages/node2nix/node-packages.nix104
-rw-r--r--user/settings/javascript.nix2
3 files changed, 59 insertions, 49 deletions
diff --git a/user/packages/node2nix/node-packages.json b/user/packages/node2nix/node-packages.json
index 3f6e020b..5a853e5c 100644
--- a/user/packages/node2nix/node-packages.json
+++ b/user/packages/node2nix/node-packages.json
@@ -2,7 +2,7 @@
   "prettier_d",
   "dockerfile-language-server-nodejs",
   "yaml-language-server",
-  { "pnpm": "3.6.2" },
+  { "pnpm": "4.1.7" },
   "bunyan",
   "pino-pretty"
 ]
diff --git a/user/packages/node2nix/node-packages.nix b/user/packages/node2nix/node-packages.nix
index ae1ee1bd..30965cb5 100644
--- a/user/packages/node2nix/node-packages.nix
+++ b/user/packages/node2nix/node-packages.nix
@@ -58,13 +58,13 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "bluebird-3.5.5" = {
+    "bluebird-3.7.1" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.5";
+      version = "3.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
-        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz";
+        sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==";
       };
     };
     "brace-expansion-1.1.11" = {
@@ -139,13 +139,13 @@ let
         sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
       };
     };
-    "commander-2.20.1" = {
+    "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.1";
+      version = "2.20.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz";
-        sha512 = "cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "concat-map-0.0.1" = {
@@ -364,13 +364,13 @@ let
         sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
       };
     };
-    "https-proxy-agent-2.2.2" = {
+    "https-proxy-agent-2.2.4" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "2.2.2";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz";
-        sha512 = "c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz";
+        sha512 = "OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==";
       };
     };
     "inflight-1.0.6" = {
@@ -436,13 +436,13 @@ let
         sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
       };
     };
-    "jsonc-parser-2.1.1" = {
+    "jsonc-parser-2.2.0" = {
       name = "jsonc-parser";
       packageName = "jsonc-parser";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.1.1.tgz";
-        sha512 = "VC0CjnWJylKB1iov4u76/W/5Ef0ydDkjtYWxoZ9t3HdWlSnZQwZL5MgFikaB/EtQ4RmMEw3tmQzuYnZA2/Ja1g==";
+        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.0.tgz";
+        sha512 = "4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA==";
       };
     };
     "jsonify-0.0.0" = {
@@ -670,13 +670,13 @@ let
         sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==";
       };
     };
-    "request-light-0.2.4" = {
+    "request-light-0.2.5" = {
       name = "request-light";
       packageName = "request-light";
-      version = "0.2.4";
+      version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-light/-/request-light-0.2.4.tgz";
-        sha512 = "pM9Fq5jRnSb+82V7M97rp8FE9/YNeP2L9eckB4Szd7lyeclSIx02aIpPO/6e4m6Dy31+FBN/zkFMTd2HkNO3ow==";
+        url = "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz";
+        sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==";
       };
     };
     "resolve-1.12.0" = {
@@ -814,13 +814,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "vscode-json-languageservice-3.3.4" = {
+    "vscode-json-languageservice-3.4.5" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
-      version = "3.3.4";
+      version = "3.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.3.4.tgz";
-        sha512 = "/nuI4uDBfxyVyeGtBdYwP/tIaXYKOoymUOSozYKLzsmrDmu555gZpzc11LrARa96z92wSaa5hfjTtNMAoM2mxw==";
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.5.tgz";
+        sha512 = "imwfS67aqfYu6ZczqF/mf6/u0h7SxeUaxebFgJDn4ZGDEYV+4wSS7/yAB1L+frK9Jk2deE/6C1j/cDPecIgGiA==";
       };
     };
     "vscode-jsonrpc-4.0.0" = {
@@ -850,6 +850,15 @@ let
         sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
       };
     };
+    "vscode-languageserver-textdocument-1.0.0-next.3" = {
+      name = "vscode-languageserver-textdocument";
+      packageName = "vscode-languageserver-textdocument";
+      version = "1.0.0-next.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.3.tgz";
+        sha512 = "uAz2tOpYJI27Q3xJYlVwj5QAgA32gkJLi5Th5nP2uIj5EtQ6ZwBrA7Hqgy85evprLGinsdJddkPgBYEFka1v7w==";
+      };
+    };
     "vscode-languageserver-types-3.14.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -859,13 +868,13 @@ let
         sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
       };
     };
-    "vscode-languageserver-types-3.15.0-next.5" = {
+    "vscode-languageserver-types-3.15.0-next.6" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.15.0-next.5";
+      version = "3.15.0-next.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.5.tgz";
-        sha512 = "7hrELhTeWieUgex3+6692KjCkcmO/+V/bFItM5MHGcBotzwmjEuXjapLLYTYhIspuJ1ibRSik5MhX5YwLpsPiw==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.6.tgz";
+        sha512 = "+4jfvmZ26oFMSX6EgPRB75PWHoT8pzyWuSSWk0erC4hTzmJq2gWxVLh20bZutZjMmiivawvPshtM3XZhX2SttA==";
       };
     };
     "vscode-languageserver-types-3.6.0" = {
@@ -895,13 +904,13 @@ let
         sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==";
       };
     };
-    "vscode-uri-2.0.3" = {
+    "vscode-uri-2.1.1" = {
       name = "vscode-uri";
       packageName = "vscode-uri";
-      version = "2.0.3";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.3.tgz";
-        sha512 = "4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==";
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz";
+        sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==";
       };
     };
     "wordwrap-1.0.0" = {
@@ -944,7 +953,7 @@ in
     };
     dependencies = [
       sources."ansi-styles-3.2.1"
-      sources."bluebird-3.5.5"
+      sources."bluebird-3.7.1"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
       (sources."chalk-2.4.2" // {
@@ -954,7 +963,7 @@ in
       })
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.20.1"
+      sources."commander-2.20.3"
       sources."config-attendant-0.1.2"
       sources."deep-extend-0.5.1"
       sources."deep-is-0.1.3"
@@ -1060,16 +1069,16 @@ in
       sources."es6-promisify-5.0.0"
       sources."esprima-4.0.1"
       sources."http-proxy-agent-2.1.0"
-      sources."https-proxy-agent-2.2.2"
+      sources."https-proxy-agent-2.2.4"
       sources."js-yaml-3.13.1"
-      sources."jsonc-parser-2.1.1"
+      sources."jsonc-parser-2.2.0"
       sources."ms-2.0.0"
       sources."prettier-1.18.2"
-      sources."request-light-0.2.4"
+      sources."request-light-0.2.5"
       sources."sprintf-js-1.0.3"
-      (sources."vscode-json-languageservice-3.3.4" // {
+      (sources."vscode-json-languageservice-3.4.5" // {
         dependencies = [
-          sources."vscode-languageserver-types-3.15.0-next.5"
+          sources."vscode-languageserver-types-3.15.0-next.6"
         ];
       })
       sources."vscode-jsonrpc-4.0.0"
@@ -1079,9 +1088,10 @@ in
         ];
       })
       sources."vscode-languageserver-protocol-3.14.1"
+      sources."vscode-languageserver-textdocument-1.0.0-next.3"
       sources."vscode-languageserver-types-3.14.0"
       sources."vscode-nls-4.1.1"
-      sources."vscode-uri-2.0.3"
+      sources."vscode-uri-2.1.1"
       sources."yaml-ast-parser-custom-tags-0.0.43"
     ];
     buildInputs = globalBuildInputs;
@@ -1094,13 +1104,13 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "pnpm-3.6.2" = nodeEnv.buildNodePackage {
+  "pnpm-4.1.7" = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "3.6.2";
+    version = "4.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.2.tgz";
-      sha512 = "/UW87zxOU3p60deTeo94GX/ZR6ph1tGDDZmCnIFvo2gMsAaWAM/nePuAdT/RZ3cbSJfG3+/HXxsYOxetAjC/Sg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.1.7.tgz";
+      sha512 = "0JfrmMLsy5x5nwUULUnXmKz6IbRXLc1r04STPDje6SIwcnyDwiRC5gR4LkC+AgVe2HuIhOSQm/MM1ypC63JDnQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -1154,10 +1164,10 @@ in
   pino-pretty = nodeEnv.buildNodePackage {
     name = "pino-pretty";
     packageName = "pino-pretty";
-    version = "3.2.1";
+    version = "3.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pino-pretty/-/pino-pretty-3.2.1.tgz";
-      sha512 = "PGdcRYw7HCF7ovMhrnepOUmEVh5+tATydRrBICEbP37oRasXV+lo2HA9gg8b7cE7LG6G1OZGVXTZ7MLd946k1Q==";
+      url = "https://registry.npmjs.org/pino-pretty/-/pino-pretty-3.3.0.tgz";
+      sha512 = "aoQWRJscJrKG/YH8GKqvbYalp8rr0KDn/SUmt2XK7q3ovA8GTN6OqvomPan7soNXLUKuYJc4UQdh0Fx+15yQpw==";
     };
     dependencies = [
       sources."@hapi/bourne-1.3.2"
diff --git a/user/settings/javascript.nix b/user/settings/javascript.nix
index 50e54d14..1d5cfab0 100644
--- a/user/settings/javascript.nix
+++ b/user/settings/javascript.nix
@@ -42,7 +42,7 @@ in
 
     node2nixPackages.bunyan
     node2nixPackages.pino-pretty
-    node2nixPackages."pnpm-3.6.2"
+    node2nixPackages."pnpm-4.1.7"
     node2nixPackages.prettier_d
     node2nixPackages.dockerfile-language-server-nodejs
     node2nixPackages.yaml-language-server