From eddfe7f7f4e31b706ce471db9d19b2825ba3c6cc Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 27 Sep 2019 16:06:37 +0200
Subject: javascript: use pinned pnpm version

---
 modules/development/javascript.nix   |  2 +-
 packages/node2nix/node-packages.json |  3 ++-
 packages/node2nix/node-packages.nix  | 44 +++++++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 16ad0c9..6b1cb6a 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -38,9 +38,9 @@ in
     csslint
     eslint_d
     prettier
-    pnpm
     typescript
 
+    node2nixPackages."pnpm-3.6.2"
     node2nixPackages.prettier_d
     node2nixPackages.dockerfile-language-server-nodejs
     node2nixPackages.yaml-language-server
diff --git a/packages/node2nix/node-packages.json b/packages/node2nix/node-packages.json
index badad3d..198958c 100644
--- a/packages/node2nix/node-packages.json
+++ b/packages/node2nix/node-packages.json
@@ -1,5 +1,6 @@
 [
   "prettier_d",
   "dockerfile-language-server-nodejs",
-  "yaml-language-server"
+  "yaml-language-server",
+  { "pnpm": "3.6.2" }
 ]
diff --git a/packages/node2nix/node-packages.nix b/packages/node2nix/node-packages.nix
index 660b51a..5a70ef8 100644
--- a/packages/node2nix/node-packages.nix
+++ b/packages/node2nix/node-packages.nix
@@ -517,13 +517,13 @@ let
         sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544";
       };
     };
-    "vscode-json-languageservice-3.3.3" = {
+    "vscode-json-languageservice-3.3.4" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
-      version = "3.3.3";
+      version = "3.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.3.3.tgz";
-        sha512 = "5vL3OXTUuQpn6+tGd47dopio+7WwbtIZ07zfYMzAUX8eVWPZjfEsLeSWmQk5Xw+vwgu+j5zC4koz5UofLDGGRA==";
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.3.4.tgz";
+        sha512 = "/nuI4uDBfxyVyeGtBdYwP/tIaXYKOoymUOSozYKLzsmrDmu555gZpzc11LrARa96z92wSaa5hfjTtNMAoM2mxw==";
       };
     };
     "vscode-jsonrpc-4.0.0" = {
@@ -562,13 +562,13 @@ let
         sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
       };
     };
-    "vscode-languageserver-types-3.15.0-next.4" = {
+    "vscode-languageserver-types-3.15.0-next.5" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.15.0-next.4";
+      version = "3.15.0-next.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.4.tgz";
-        sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.5.tgz";
+        sha512 = "7hrELhTeWieUgex3+6692KjCkcmO/+V/bFItM5MHGcBotzwmjEuXjapLLYTYhIspuJ1ibRSik5MhX5YwLpsPiw==";
       };
     };
     "vscode-languageserver-types-3.6.0" = {
@@ -741,10 +741,10 @@ in
   yaml-language-server = nodeEnv.buildNodePackage {
     name = "yaml-language-server";
     packageName = "yaml-language-server";
-    version = "0.5.7";
+    version = "0.5.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.5.7.tgz";
-      sha512 = "bewRCXbsdZgag9pw9bCyXbjABrL/okj+FO80FXLyCRC8PXYKxnyE3Nls9AasMcYjsCJ/TjamyV8ICZiEN4c09Q==";
+      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.5.8.tgz";
+      sha512 = "IDPHRXJJz3W7MIksFGwQ9GweY+n064MSsiC3LpoxURdafNQ+6OcBAuVwfJdItRTGSB96l2soQB5UfjiqVBeggQ==";
     };
     dependencies = [
       sources."agent-base-4.3.0"
@@ -761,9 +761,9 @@ in
       sources."prettier-1.18.2"
       sources."request-light-0.2.4"
       sources."sprintf-js-1.0.3"
-      (sources."vscode-json-languageservice-3.3.3" // {
+      (sources."vscode-json-languageservice-3.3.4" // {
         dependencies = [
-          sources."vscode-languageserver-types-3.15.0-next.4"
+          sources."vscode-languageserver-types-3.15.0-next.5"
         ];
       })
       sources."vscode-jsonrpc-4.0.0"
@@ -788,4 +788,22 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  "pnpm-3.6.2" = nodeEnv.buildNodePackage {
+    name = "pnpm";
+    packageName = "pnpm";
+    version = "3.6.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-3.6.2.tgz";
+      sha512 = "/UW87zxOU3p60deTeo94GX/ZR6ph1tGDDZmCnIFvo2gMsAaWAM/nePuAdT/RZ3cbSJfG3+/HXxsYOxetAjC/Sg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Fast, disk space efficient package manager";
+      homepage = https://pnpm.js.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }
\ No newline at end of file
-- 
cgit 1.4.1