Merge: [Backport release-24.05] meshcentral: 1.1.32 -> 1.1.33 (#354553)

pkgs/tools/admin/meshcentral/default.nix

@@ -1,5 +1,6 @@
 { lib
 , fetchzip
+, fetchpatch
 , fetchYarnDeps
 , yarn2nix-moretea
 , nodejs_18
@@ -7,21 +8,31 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.32";
+  version = "1.1.33";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.32.tgz";
-    sha256 = "1faf1f4rkk3164fhh3bp6h4sbkgaq1x8swdsvnhwy0fqckzkcwms";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.33.tgz";
+    sha256 = "0s362iwnwmfpz5gbjnvjwccchx03hl53v6yqyyy34vy4f1mxvyim";
   };
 
-  patches = [ ./fix-js-include-paths.patch ];
+  patches = [
+    ./fix-js-include-paths.patch
+
+    # With this change, meshcentral fails to detect installed dependencies
+    # and tries to install those at runtime. Hence, reverting.
+    (fetchpatch {
+      hash = "sha256-MtFnU1FI7wNBiTGmW67Yn4oszviODcAJOL1PIi78+ic=";
+      url = "https://github.com/Ylianst/MeshCentral/commit/cfe9345b53fcd660985d7ce7b82278182b40f41e.patch";
+      revert = true;
+    })
+  ];
 
   packageJSON = ./package.json;
   yarnLock = ./yarn.lock;
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-e+qzA0u4OywlcHpxLnoZQc2h35M65/GKu8mYs6+1I5c=";
+    hash = "sha256-W1MMZRDoeBJ3nGzXFVPGsrAtk4FlQGTUhFpPCdpdHPI=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

pkgs/tools/admin/meshcentral/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -42,16 +42,16 @@
     "body-parser": "1.20.3",
     "cbor": "5.2.0",
     "compression": "1.7.4",
-    "cookie-session": "2.0.0",
-    "express": "4.21.0",
+    "cookie-session": "2.1.0",
+    "express": "4.21.1",
     "express-handlebars": "7.1.3",
     "express-ws": "5.0.2",
     "ipcheck": "0.1.0",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
     "node-forge": "1.3.1",
-    "ua-parser-js": "1.0.37",
-    "ws": "8.17.1",
+    "ua-parser-js": "1.0.39",
+    "ws": "8.18.0",
     "yauzl": "2.10.0"
   },
   "engines": {
@@ -70,14 +70,14 @@
     "passport-github2": "*",
     "passport-azure-oauth2": "*",
     "jwt-simple": "*",
-    "openid-client": "*",
+    "openid-client": "5.7.0",
     "passport-saml": "*",
     "archiver": "7.0.1",
     "body-parser": "1.20.3",
     "cbor": "5.2.0",
     "compression": "1.7.4",
-    "cookie-session": "2.0.0",
-    "express": "4.21.0",
+    "cookie-session": "2.1.0",
+    "express": "4.21.1",
     "express-handlebars": "7.1.3",
     "express-ws": "5.0.2",
     "ipcheck": "0.1.0",
@@ -85,16 +85,16 @@
     "multiparty": "4.2.3",
     "@yetzt/nedb": "*",
     "node-forge": "1.3.1",
-    "ua-parser-js": "1.0.37",
-    "ws": "8.17.1",
+    "ua-parser-js": "1.0.39",
+    "ws": "8.18.0",
     "yauzl": "2.10.0",
     "node-windows": "0.1.14",
     "loadavg-windows": "1.1.1",
     "node-sspi": "0.2.10",
     "ldapauth-fork": "5.0.5",
-    "ssh2": "1.15.0",
+    "ssh2": "1.16.0",
     "svg-captcha": "1.4.0",
-    "image-size": "1.0.2",
+    "image-size": "1.1.1",
     "acme-client": "4.2.5",
     "aedes": "0.39.0",
     "mysql2": "3.6.2",
@@ -110,7 +110,7 @@
     "semver": "7.5.4",
     "https-proxy-agent": "7.0.2",
     "mongojs": "3.1.0",
-    "nodemailer": "6.9.8",
+    "nodemailer": "6.9.15",
     "@sendgrid/mail": "*",
     "jsdom": "22.1.0",
     "esprima": "4.0.1",