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

Merge pull request #106436 from Ma27/matrix-updates 

matrix-synapse: 1.23.0 -> 1.24.0, element-*: 1.7.14 -> 1.7.15
This commit is contained in:
Maximilian Bosch 2020-12-09 19:13:09 +01:00 committed by GitHub
parent b8936e5523 917cac4663
commit ace2457eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,12 +2,12 @@
"name": "element-desktop", "name": "element-desktop",
"productName": "Element", "productName": "Element",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.7.14", "version": "1.7.15",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/vector-im/riot-desktop" "url": "https://github.com/vector-im/element-desktop"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"files": [], "files": [],
@ -21,7 +21,7 @@
"build32": "electron-builder --ia32", "build32": "electron-builder --ia32",
"build64": "electron-builder --x64", "build64": "electron-builder --x64",
"build": "electron-builder", "build": "electron-builder",
"docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
"docker:build:native": "scripts/in-docker.sh yarn run hak", "docker:build:native": "scripts/in-docker.sh yarn run hak",
"docker:build": "scripts/in-docker.sh yarn run build", "docker:build": "scripts/in-docker.sh yarn run build",
"docker:install": "scripts/in-docker.sh yarn install", "docker:install": "scripts/in-docker.sh yarn install",
@ -62,7 +62,7 @@
}, },
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"electronVersion": "10.1.3", "electronVersion": "10.1.6",
"files": [ "files": [
"package.json", "package.json",
{ {

6
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.14"; version = "1.7.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "riot-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv"; sha256 = "sha256-7kWf8MXSB4/sX1bjMsfkzgzElS/AYu5VHAKGcqgvH54=";
}; };
electron = electron_9; electron = electron_9;

6
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.14"; version = "1.7.15";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j"; sha256 = "sha256-ZSi0OLA5dyPXn1NlZkkhCmWhrSryfyj/O6Ux1lO12ns=";
}; };
installPhase = '' installPhase = ''

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -10,11 +10,11 @@ let
in in
buildPythonApplication rec { buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.23.0"; version = "1.24.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "18an6nvxq2g21rq5ph3xlnkl75dmilcrz4ykdydz37hs09z6q1al"; sha256 = "sha256-yxcdFd7iVXbDIUx1lW73FKLy+BZfSspz60LKw7BCtl4=";
}; };
patches = [ patches = [