3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #136311 from sumnerevans/element-1.8.2

element-{web,desktop}: 1.8.1 -> 1.8.2
This commit is contained in:
Maximilian Bosch 2021-08-31 22:06:08 +02:00 committed by GitHub
commit d2196ee635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions

View file

@ -2,7 +2,7 @@
"name": "element-desktop", "name": "element-desktop",
"productName": "Element", "productName": "Element",
"main": "lib/electron-main.js", "main": "lib/electron-main.js",
"version": "1.8.1", "version": "1.8.2",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {
@ -57,7 +57,7 @@
"allchange": "^1.0.0", "allchange": "^1.0.0",
"asar": "^2.0.1", "asar": "^2.0.1",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"electron": "^13.1.7", "electron": "^13.1.9",
"electron-builder": "22.11.4", "electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4", "electron-builder-squirrel-windows": "22.11.4",
"electron-devtools-installer": "^3.1.1", "electron-devtools-installer": "^3.1.1",
@ -83,7 +83,7 @@
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "13.1.6", "electronVersion": "13.1.9",
"files": [ "files": [
"package.json", "package.json",
{ {

View file

@ -2002,11 +2002,11 @@
}; };
} }
{ {
name = "electron___electron_13.1.7.tgz"; name = "electron___electron_13.1.9.tgz";
path = fetchurl { path = fetchurl {
name = "electron___electron_13.1.7.tgz"; name = "electron___electron_13.1.9.tgz";
url = "https://registry.yarnpkg.com/electron/-/electron-13.1.7.tgz"; url = "https://registry.yarnpkg.com/electron/-/electron-13.1.9.tgz";
sha1 = "7e17f5c93a8d182a2a486884fed3dc34ab101be9"; sha1 = "668e2632b81e9fa21edfd32876282d3e2ff7fd76";
}; };
} }
{ {

View file

@ -19,12 +19,12 @@
let let
executableName = "element-desktop"; executableName = "element-desktop";
version = "1.8.1"; version = "1.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "element-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-FIKbyfnRuHBbmtjwxNC//n5UiGTCQNr+PeiZEi3+RGI="; sha256 = "sha256-6DPMfx3LF45YWn2do02zDMLYZGBgBrOMJx3XBAO0ZyM=";
}; };
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in in

View file

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "element-web"; pname = "element-web";
version = "1.8.1"; version = "1.8.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-C2oWYpPxMeSgGKyjUe6Ih13ggZliN4bmAX5cakzW1u8="; sha256 = "sha256-SgVxYPmdgFn6Nll1a6b1Sn2H5I0Vkjorn3gA9d5FamQ=";
}; };
installPhase = '' installPhase = ''