[Backport release-24.05] meshcentral: 1.1.27 -> 1.1.29 (#340822)

NixOS · Sep 9, 2024 · bb41063 · bb41063
2 parents f20a614 + 05bb1c5
commit bb41063
Show file tree

Hide file tree

Showing 3 changed files with 465 additions and 355 deletions.
diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
@@ -7,11 +7,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.27";
+  version = "1.1.29";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.27.tgz";
-    sha256 = "1m9wsny6b2lwis2ppalmc9qzn3b8pblgv1cszqbaywb835ll516g";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.29.tgz";
+    sha256 = "0ghwcndv753n3xkhi93jv0k9s0ch553g5q6b39fiv78ixa1f4h57";
   };
 
   patches = [ ./fix-js-include-paths.patch ];
@@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-XQTHIFMxtb4G7gkksAU/oHajdNf0McFbubumW/8Gn1w=";
+    hash = "sha256-9fW6nZElij7P7rSS0xVxISpPpKdi9eOxQdmJ79jGSgw=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -45,7 +45,7 @@
     "cookie-session": "2.0.0",
     "express": "4.19.2",
     "express-handlebars": "5.3.5",
-    "express-ws": "4.0.0",
+    "express-ws": "5.0.2",
     "ipcheck": "0.1.0",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
@@ -79,7 +79,7 @@
     "cookie-session": "2.0.0",
     "express": "4.19.2",
     "express-handlebars": "5.3.5",
-    "express-ws": "4.0.0",
+    "express-ws": "5.0.2",
     "ipcheck": "0.1.0",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
@@ -120,6 +120,7 @@
     "archiver-zip-encrypted": "1.0.11",
     "googleapis": "128.0.0",
     "webdav": "4.11.3",
+    "minio": "8.0.1",
     "wildleek": "2.0.0",
     "yubikeyotp": "0.2.0",
     "otplib": "10.2.3",