Unverified Commit 7c30bb34 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #284525 from Ma27/bump-meshcentral 

meshcentral: 1.1.19 -> 1.1.20
parents c3bb9437 d7d077c5

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

  version = "1.1.20";



  src = fetchzip {

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

    sha256 = "0kphzzhzc29jmldbfdfczw0395a1kr38bpyz0hjl9hm0d6glz74h";

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

    sha256 = "1iykx1lrsd09z3jbykspjgibsbpcgrw5b60dmpzcc1i4fr0zpnz9";

  };



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


  offlineCache = fetchYarnDeps {

    yarnLock = ./yarn.lock;

    hash = "sha256-tKS7Nrd5tWuRFfl5hZXCmVBxUe+W3+uhtw0YF0IBGZU=";

    hash = "sha256-zLbD0UhCRQNTka1WUjDuZLseS1PMURQSPFEa0SvwS7E=";

  };



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

pkgs/tools/admin/meshcentral/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "meshcentral",

  "version": "1.1.19",

  "version": "1.1.20",

  "keywords": [

    "Remote Device Management",

    "Remote Device Monitoring",

pkgs/tools/admin/meshcentral/update.sh

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ update-source-version meshcentral "$version" "$hash" "$tarball" 
new_yarn_hash=$(prefetch-yarn-deps "$expr_dir/yarn.lock")

new_yarn_hash=$(nix-hash --type sha256 --to-sri "$new_yarn_hash")

old_yarn_hash=$(nix-instantiate --eval -A meshcentral.offlineCache.outputHash | tr -d '"')

sed -i "$expr_dir/default.nix" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"

sed -i "$expr_dir/default.nix" -e "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"



# Only clean up if everything worked

cd /

pkgs/tools/admin/meshcentral/yarn.lock

+121 −121

File changed.

Preview size limit exceeded, changes collapsed.