diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-14 00:02:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-14 00:02:11 +0000 |
commit | caada97a278b622bfee121e25e5a251ef09eb123 (patch) | |
tree | 1254d21e492e6bf8d4a810d7177076210e795fc1 /pkgs/applications/networking/instant-messengers | |
parent | 1e960000750bd750e6ff1b41f253857da26f567e (diff) | |
parent | 5f2eb57725ce3781e01046ed26ad922d13900402 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
4 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index b470f658042fa..ac17d6d44591a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.13", + "version": "1.10.14", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-package.json b/pkgs/applications/networking/instant-messengers/element/element-web-package.json index 68aead1c0eb7a..f6fc383e034ff 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-web-package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.13", + "version": "1.10.14", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -58,8 +58,8 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "18.0.0", - "matrix-react-sdk": "3.45.0", + "matrix-js-sdk": "18.1.0", + "matrix-react-sdk": "3.46.0", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", @@ -123,7 +123,7 @@ "jest-sonar-reporter": "^2.0.0", "json-loader": "^0.5.7", "loader-utils": "^1.4.0", - "matrix-mock-request": "^1.2.3", + "matrix-mock-request": "^2.0.0", "matrix-react-test-utils": "^0.2.3", "matrix-web-i18n": "^1.2.0", "mini-css-extract-plugin": "^0.12.0", diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index ceb4673f9a585..a99d2919cb558 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.10.13", - "desktopSrcHash": "tTvpjSIipvmJIfZF1RiRtlDjsKJYHoPQ6XSqI8TGH14=", - "desktopYarnHash": "105bphn4ga4f0n60cvrlppf8wim2c1qy09g8arraadcxymds98n6", - "webSrcHash": "+imju7ojpjttmOeDnA2L4QdBi1zzfRBoUdMMTA4Lba0=", - "webYarnHash": "19b1w2mrcn3mzw40d023wx1jxvr0jacn2ryzxlh7zsyj8w0v1dv7" + "version": "1.10.14", + "desktopSrcHash": "/y4pJSNQrN0Ksc+yjB3Xl6t8AZLNtZ/Rm0UoAhwlgp8=", + "desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n", + "webSrcHash": "2CagKKFulLi8Gl/IPabzKfCFTBmw8SGa22hTM+7IewE=", + "webYarnHash": "15jjryjav3v58j4260ig548g1m6g6vhid4iigpv7k8pa4rhcwnyh" } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 1c99ded65447a..c98fce2bde26c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -149,5 +149,6 @@ in stdenv.mkDerivation rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mic92 equirosa ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } |