Unverified Commit bef3d435 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: meshcentral: 1.1.29 -> 1.1.30 (#342266)

parents 81d3d571 3f9ddaae

pkgs/tools/admin/meshcentral/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
}:



yarn2nix-moretea.mkYarnPackage {

  version = "1.1.29";

  version = "1.1.30";



  src = fetchzip {

    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.29.tgz";

    sha256 = "0ghwcndv753n3xkhi93jv0k9s0ch553g5q6b39fiv78ixa1f4h57";

    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.30.tgz";

    sha256 = "1jdnjmwwi8ipqrxb43sas46n2hvr2fsccckknqlfzkfv0lkak07q";

  };



  patches = [ ./fix-js-include-paths.patch ];
@@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage { 


  offlineCache = fetchYarnDeps {

    yarnLock = ./yarn.lock;

    hash = "sha256-9fW6nZElij7P7rSS0xVxISpPpKdi9eOxQdmJ79jGSgw=";

    hash = "sha256-1xDex/BIq1P+LbCuZfLRTckAU6RjF4XU73ZpEd1qncA=";

  };



  # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

pkgs/tools/admin/meshcentral/package.json

+7 −8
Original line number Diff line number Diff line 
{

  "name": "meshcentral",

  "version": "1.1.29",

  "version": "1.1.30",

  "keywords": [

    "Remote Device Management",

    "Remote Device Monitoring",
@@ -39,11 +39,11 @@ 
  "dependencies": {

    "@yetzt/nedb": "1.8.0",

    "archiver": "7.0.0",

    "body-parser": "1.20.2",

    "body-parser": "1.20.3",

    "cbor": "5.2.0",

    "compression": "1.7.4",

    "cookie-session": "2.0.0",

    "express": "4.19.2",

    "express": "4.21.0",

    "express-handlebars": "5.3.5",

    "express-ws": "5.0.2",

    "ipcheck": "0.1.0",
@@ -72,12 +72,12 @@ 
    "jwt-simple": "*",

    "openid-client": "*",

    "passport-saml": "*",

    "archiver": "7.0.0",

    "body-parser": "1.20.2",

    "archiver": "7.0.1",

    "body-parser": "1.20.3",

    "cbor": "5.2.0",

    "compression": "1.7.4",

    "cookie-session": "2.0.0",

    "express": "4.19.2",

    "express": "4.21.0",

    "express-handlebars": "5.3.5",

    "express-ws": "5.0.2",

    "ipcheck": "0.1.0",
@@ -114,10 +114,9 @@ 
    "@sendgrid/mail": "*",

    "jsdom": "22.1.0",

    "esprima": "4.0.1",

    "minify-js": "0.0.4",

    "html-minifier": "4.0.0",

    "@crowdsec/express-bouncer": "0.1.0",

    "archiver-zip-encrypted": "1.0.11",

    "archiver-zip-encrypted": "2.0.0",

    "googleapis": "128.0.0",

    "webdav": "4.11.3",

    "minio": "8.0.1",

pkgs/tools/admin/meshcentral/yarn.lock

+679 −3483

File changed.

Preview size limit exceeded, changes collapsed.