Skip to content

Commit

Permalink
meshcentral: 1.1.33 -> 1.1.35 (#363225)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ma27 authored Dec 9, 2024
1 parent 5cdeee4 commit d81dea3
Show file tree
Hide file tree
Showing 3 changed files with 1,117 additions and 1,377 deletions.
16 changes: 4 additions & 12 deletions pkgs/tools/admin/meshcentral/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,23 @@
}:

yarn2nix-moretea.mkYarnPackage {
version = "1.1.33";
version = "1.1.35";

src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.33.tgz";
sha256 = "0s362iwnwmfpz5gbjnvjwccchx03hl53v6yqyyy34vy4f1mxvyim";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.35.tgz";
sha256 = "0y0c6r8bijkz2pwc9mgkkg3fi7sbaawcarvcjf47xa5zkl65a2qf";
};

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-W1MMZRDoeBJ3nGzXFVPGsrAtk4FlQGTUhFpPCdpdHPI=";
hash = "sha256-wK3w5y0Ic9g6iBOUG7KseA1lPW2wzPMbJqb0YWiZJTM=";
};

# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
Expand Down
21 changes: 10 additions & 11 deletions pkgs/tools/admin/meshcentral/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.33",
"version": "1.1.35",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
Expand Down Expand Up @@ -37,7 +37,7 @@
"sample-config-advanced.json"
],
"dependencies": {
"@yetzt/nedb": "1.8.0",
"@seald-io/nedb": "4.0.4",
"archiver": "7.0.1",
"body-parser": "1.20.3",
"cbor": "5.2.0",
Expand Down Expand Up @@ -70,7 +70,7 @@
"passport-github2": "*",
"passport-azure-oauth2": "*",
"jwt-simple": "*",
"openid-client": "5.7.0",
"openid-client": "5.7.1",
"passport-saml": "*",
"archiver": "7.0.1",
"body-parser": "1.20.3",
Expand All @@ -83,7 +83,7 @@
"ipcheck": "0.1.0",
"minimist": "1.2.8",
"multiparty": "4.2.3",
"@yetzt/nedb": "*",
"@seald-io/nedb": "*",
"node-forge": "1.3.1",
"ua-parser-js": "1.0.39",
"ws": "8.18.0",
Expand All @@ -97,15 +97,14 @@
"image-size": "1.1.1",
"acme-client": "4.2.5",
"aedes": "0.39.0",
"mysql2": "3.6.2",
"mysql2": "3.11.4",
"@mysql/xdevapi": "8.0.33",
"mongodb": "4.13.0",
"saslprep": "1.0.3",
"pg": "8.7.1",
"pgtools": "0.3.2",
"mariadb": "3.2.2",
"pg": "8.13.1",
"mariadb": "3.4.0",
"acebase": "1.29.5",
"sqlite3": "5.1.6",
"sqlite3": "5.1.7",
"node-vault": "0.10.2",
"semver": "7.5.4",
"https-proxy-agent": "7.0.2",
Expand All @@ -118,7 +117,7 @@
"@crowdsec/express-bouncer": "0.1.0",
"archiver-zip-encrypted": "2.0.0",
"googleapis": "128.0.0",
"webdav": "4.11.3",
"webdav": "4.11.4",
"minio": "8.0.1",
"wildleek": "2.0.0",
"yubikeyotp": "0.2.0",
Expand All @@ -133,7 +132,7 @@
"node-pushover": "1.0.0",
"zulip": "0.1.0",
"web-push": "3.6.6",
"node-xcs": "0.1.7",
"node-xcs": "0.1.8",
"modern-syslog": "1.2.0",
"syslog": "0.1.1-1",
"heapdump": "0.3.15"
Expand Down
Loading

0 comments on commit d81dea3

Please sign in to comment.