Merge pull request #126102 from TredwellGit/element

element: 1.7.29 -> 1.7.30
master
Pascal Bach 2021-06-07 22:21:25 +02:00 committed by GitHub
commit 7c33757e2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 133 additions and 804 deletions

View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.29",
"version": "1.7.30",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -47,8 +47,9 @@
"electron-builder-squirrel-windows": "22.10.5",
"electron-devtools-installer": "^3.1.1",
"electron-notarize": "^1.0.0",
"eslint": "7.3.1",
"eslint-config-matrix-org": "^0.1.2",
"eslint": "7.18.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
@ -67,7 +68,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "12.0.2",
"electronVersion": "12.0.9",
"files": [
"package.json",
{

View File

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.29";
version = "1.7.30";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s=";
sha256 = "09k1xxmzqvw8c1x9ndsdvwj4598rdx9zqraz3rmr3i58s51vycxp";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.29";
version = "1.7.30";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE=";
sha256 = "1pnmgdyacxfk8hdf930rqqvqrcvckc3m4pb5mkznlirsmw06nfay";
};
installPhase = ''