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

Merge: meshcentral: 1.1.45 -> 1.1.46 (#422988)

parents fafdb67f f58d55f6

pkgs/tools/admin/meshcentral/default.nix

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



yarn2nix-moretea.mkYarnPackage {

  version = "1.1.45";

  version = "1.1.46";



  src = fetchzip {

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

    sha256 = "1dwn0xaqa5f2wzlc3xygwww0pv9dkvxax8a5ysy08d9zsnpy61ra";

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

    sha256 = "143ls8455c4vaj0cnai08h7f8mj8llzbjaa54mhcri0aqdh5b5yg";

  };



  patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage { 


  offlineCache = fetchYarnDeps {

    yarnLock = ./yarn.lock;

    hash = "sha256-mH8R2KMN1rSbRkKPUV5BhnL7VjAN8m8O5stg+s9Zye8=";

    hash = "sha256-VzxNWtbn/ToODqE3jU7n0xpaOZmst55wJ2+dZLonIaA=";

  };



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

pkgs/tools/admin/meshcentral/package.json

+3 −4
Original line number Diff line number Diff line 
{

  "name": "meshcentral",

  "version": "1.1.45",

  "version": "1.1.46",

  "keywords": [

    "Remote Device Management",

    "Remote Device Monitoring",
@@ -108,19 +108,18 @@ 
    "acebase": "1.29.5",

    "sqlite3": "5.1.7",

    "node-vault": "0.10.2",

    "semver": "7.7.1",

    "https-proxy-agent": "7.0.2",

    "mongojs": "3.1.0",

    "nodemailer": "6.9.16",

    "@sendgrid/mail": "*",

    "jsdom": "22.1.0",

    "esprima": "4.0.1",

    "html-minifier": "4.0.0",

    "html-minifier-terser": "7.2.0",

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

    "prom-client": "*",

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

    "googleapis": "128.0.0",

    "webdav": "4.11.4",

    "webdav": "5.8.0",

    "minio": "8.0.2",

    "wildleek": "2.0.0",

    "yubikeyotp": "0.2.0",

pkgs/tools/admin/meshcentral/yarn.lock

+842 −774

File changed.

Preview size limit exceeded, changes collapsed.