public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #132462 from NixOS/backport-132438-to-release-21.05

Browse Source 
[Backport release-21.05] element-{web,desktop}: 1.7.33 -> 1.7.34
This commit is contained in:
Maximilian Bosch 2021-08-03 11:52:21 +02:00 committed by GitHub
commit 4feab93d28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 603 additions and 2587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
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.7.33", "version": "1.7.34",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {
@ -20,7 +20,8 @@
"asar-webapp": "asar p webapp webapp.asar", "asar-webapp": "asar p webapp webapp.asar",
"start": "yarn run build:ts && yarn run build:res && electron .", "start": "yarn run build:ts && yarn run build:res && electron .",
"lint": "yarn lint:types && yarn lint:js", "lint": "yarn lint:types && yarn lint:js",
"lint:js": "eslint src/ scripts/ hak/", "lint:js": "eslint --max-warnings 0 src scripts hak",
"lint:js-fix": "eslint --fix src scripts hak",
"lint:types": "tsc --noEmit", "lint:types": "tsc --noEmit",
"build:native": "yarn run hak", "build:native": "yarn run hak",
"build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink", "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
@ -55,7 +56,7 @@
"@typescript-eslint/parser": "^4.17.0", "@typescript-eslint/parser": "^4.17.0",
"asar": "^2.0.1", "asar": "^2.0.1",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"electron": "12.0.11", "electron": "^13.1.7",
"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",
@ -70,19 +71,18 @@
"mkdirp": "^1.0.3", "mkdirp": "^1.0.3",
"needle": "^2.5.0", "needle": "^2.5.0",
"node-pre-gyp": "^0.15.0", "node-pre-gyp": "^0.15.0",
"npm": "^6.14.11", "pacote": "^11.3.5",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"semver": "^7.3.4",
"tar": "^6.1.0", "tar": "^6.1.0",
"typescript": "^4.1.3" "typescript": "^4.1.3"
}, },
"hakDependencies": { "hakDependencies": {
"matrix-seshat": "^2.2.3", "matrix-seshat": "^2.3.0",
"keytar": "^5.6.0" "keytar": "^5.6.0"
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "12.0.14", "electronVersion": "13.1.6",
"files": [ "files": [
"package.json", "package.json",
{ {

3168
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let let
executableName = "element-desktop"; executableName = "element-desktop";
version = "1.7.33"; version = "1.7.34";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "element-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1JmuKyJt6Q80lLXXrFw+h6/0JzWcr0qMIU9mTO+K56I="; sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY=";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "element-web"; pname = "element-web";
version = "1.7.33"; version = "1.7.34";
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-MhbXvl+FUCL6D6y2Oa5Kf5ie9fU85wEO/tQe881CD8I="; sha256 = "sha256-0M2LuVSHIGRwzq00wgzlzTVWh3WItNN+JDNf+u+9V30=";
}; };
installPhase = '' installPhase = ''