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

Merge pull request #315060 from NixOS/backport-314938-to-release-24.05 

[Backport release-24.05] meshcentral: 1.1.22 -> 1.1.24
parents a1e0c818 51b088b4

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.22";

  version = "1.1.24";



  src = fetchzip {

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

    sha256 = "14hxynja1xybzcv9wabhn2ps7ngnigb4hs2lc2zz162wd1phv6j1";

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

    sha256 = "1x5ibbmdrd6yv3xv3qlcd2b1mj9wpdsfgcmrcjl3js34zrygmixc";

  };



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


  offlineCache = fetchYarnDeps {

    yarnLock = ./yarn.lock;

    hash = "sha256-smx37i/0MFmZYGqjE3NgySDiZfKP/4SHtFSYko/6mAU=";

    hash = "sha256-L4rBVq/JhkcSQs/GrQJ+gcAV0vyi+9yS6B3p3O14IfE=";

  };



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

pkgs/tools/admin/meshcentral/package.json

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

  "name": "meshcentral",

  "version": "1.1.22",

  "version": "1.1.24",

  "keywords": [

    "Remote Device Management",

    "Remote Device Monitoring",
@@ -42,7 +42,7 @@ 
    "cbor": "5.2.0",

    "compression": "1.7.4",

    "cookie-session": "2.0.0",

    "express": "4.18.2",

    "express": "4.19.2",

    "express-handlebars": "5.3.5",

    "express-ws": "4.0.0",

    "ipcheck": "0.1.0",
@@ -55,7 +55,7 @@ 
    "yauzl": "2.10.0"

  },

  "engines": {

    "node": ">=11.0.0"

    "node": ">=16.0.0"

  },

  "repository": {

    "type": "git",
@@ -70,13 +70,14 @@ 
    "passport-azure-oauth2": "*",

    "jwt-simple": "*",

    "openid-client": "*",

    "connect-flash": "*",

    "passport-saml": "*",

    "archiver": "7.0.0",

    "body-parser": "1.20.2",

    "cbor": "5.2.0",

    "compression": "1.7.4",

    "cookie-session": "2.0.0",

    "express": "4.18.2",

    "express": "4.19.2",

    "express-handlebars": "5.3.5",

    "express-ws": "4.0.0",

    "ipcheck": "0.1.0",

pkgs/tools/admin/meshcentral/yarn.lock

+1004 −1049

File changed.

Preview size limit exceeded, changes collapsed.