summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-02-01 21:18:07 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-02-02 16:11:02 +0000
commit6a37719b90d4b76640c6bb328d4178c14dcf730a (patch)
tree9954f3c975e219d55d3f0fbba89de6148865c6a4
parentMerge pull request #157795 from NixOS/backport-157598-to-release-21.11 (diff)
downloadnixpkgs-6a37719b90d4b76640c6bb328d4178c14dcf730a.tar.gz
element-{web,desktop}: 1.9.9 -> 1.10.1
ChangeLogs: * https://github.com/vector-im/element-web/releases/tag/v1.10.0 * https://github.com/vector-im/element-web/releases/tag/v1.10.1 (cherry picked from commit f558c4a5d675abc5d9b284be714ba9296d0d35be)
-rw-r--r--pkgs/applications/networking/instant-messengers/element/element-desktop-package.json9
-rw-r--r--pkgs/applications/networking/instant-messengers/element/pin.json8
2 files changed, 9 insertions, 8 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 c091a882d772..90a08236676c 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.9.9",
+ "version": "1.10.1",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -61,18 +61,19 @@
"app-builder-lib": "^22.14.10",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
- "electron": "13.5",
+ "electron": "^15.3.5",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
"electron-devtools-installer": "^3.1.1",
"electron-notarize": "^1.0.0",
"eslint": "7.18.0",
"eslint-config-google": "^0.14.0",
- "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
+ "eslint-plugin-import": "^2.25.4",
+ "eslint-plugin-matrix-org": "^0.4.0",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
- "matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
+ "matrix-web-i18n": "^1.2.0",
"mkdirp": "^1.0.3",
"needle": "^2.5.0",
"node-pre-gyp": "^0.15.0",
diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json
index 25e335decc8b..05e20b01d747 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.json
+++ b/pkgs/applications/networking/instant-messengers/element/pin.json
@@ -1,6 +1,6 @@
{
- "version": "1.9.9",
- "desktopSrcHash": "IMqco5HeAgsh1LMBXFH1/HnlIEFEQU0xqnHbTKwHGL4=",
- "desktopYarnHash": "0zzr14fcyc5q2562x50nvxxda10yr5ihbr12nykzg4j534rgb55y",
- "webHash": "1i3zka9cfn14rv5wzz969w6dz5dbkw87clrgajs8p1s2l62ac1jf"
+ "version": "1.10.1",
+ "desktopSrcHash": "cA+yXVkfizVRbbykFRhNIbdaGLuEk2IuKFO8YJt78Q4=",
+ "desktopYarnHash": "0kz6vkfxxk4sbr9zpaig1lhsbwj4f57v4f4pr373xxsnk1wagkfn",
+ "webHash": "1g5hw39fr7adazmafpxivfxv28nzcv99r8sihga1j91avf6lxkim"
}