git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #106436 from Ma27/matrix-updates

matrix-synapse: 1.23.0 -> 1.24.0, element-*: 1.7.14 -> 1.7.15

commitace2457eafa8169ed9495251d28371b37eb71fa5 authorMaximilian Bosch <maximilian@mbosch.me> dateWed 9 Dec 2020, 19:13 (6 years ago) parentb8936e5917cac4
4 files changed+12−12
compare with master
unifiedsplit
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+4−4 pkgs/applications/networking/instant-messengers/element/element-desktop.nix+3−3 pkgs/applications/networking/instant-messengers/element/element-web.nix+3−3 pkgs/servers/matrix-synapse/default.nix+2−2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+4−4
@@ -2,12 +2,12 @@
22 "name": "element-desktop",
33 "productName": "Element",
44 "main": "src/electron-main.js",
5− "version": "1.7.14",
5+ "version": "1.7.15",
66 "description": "A feature-rich client for Matrix.org",
77 "author": "Element",
88 "repository": {
99 "type": "git",
10− "url": "https://github.com/vector-im/riot-desktop"
10+ "url": "https://github.com/vector-im/element-desktop"
1111 },
1212 "license": "Apache-2.0",
1313 "files": [],
@@ -21,7 +21,7 @@
2121 "build32": "electron-builder --ia32",
2222 "build64": "electron-builder --x64",
2323 "build": "electron-builder",
24− "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
24+ "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
2525 "docker:build:native": "scripts/in-docker.sh yarn run hak",
2626 "docker:build": "scripts/in-docker.sh yarn run build",
2727 "docker:install": "scripts/in-docker.sh yarn install",
@@ -62,7 +62,7 @@
6262 },
6363 "build": {
6464 "appId": "im.riot.app",
65− "electronVersion": "10.1.3",
65+ "electronVersion": "10.1.6",
6666 "files": [
6767 "package.json",
6868 {
pkgs/applications/networking/instant-messengers/element/element-desktop.nix+3−3
@@ -8,12 +8,12 @@
88
99let
1010 executableName = "element-desktop";
11− version = "1.7.14";
11+ version = "1.7.15";
1212 src = fetchFromGitHub {
1313 owner = "vector-im";
14− repo = "riot-desktop";
14+ repo = "element-desktop";
1515 rev = "v${version}";
16− sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv";
16+ sha256 = "sha256-7kWf8MXSB4/sX1bjMsfkzgzElS/AYu5VHAKGcqgvH54=";
1717 };
1818 electron = electron_9;
1919
pkgs/applications/networking/instant-messengers/element/element-web.nix+3−3
@@ -12,11 +12,11 @@ let
1212
1313in stdenv.mkDerivation rec {
1414 pname = "element-web";
15− version = "1.7.14";
15+ version = "1.7.15";
1616
1717 src = fetchurl {
18− url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
19− sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j";
18+ url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
19+ sha256 = "sha256-ZSi0OLA5dyPXn1NlZkkhCmWhrSryfyj/O6Ux1lO12ns=";
2020 };
2121
2222 installPhase = ''
pkgs/servers/matrix-synapse/default.nix+2−2
@@ -10,11 +10,11 @@ let
1010in
1111buildPythonApplication rec {
1212 pname = "matrix-synapse";
13− version = "1.23.0";
13+ version = "1.24.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "18an6nvxq2g21rq5ph3xlnkl75dmilcrz4ykdydz37hs09z6q1al";
17+ sha256 = "sha256-yxcdFd7iVXbDIUx1lW73FKLy+BZfSspz60LKw7BCtl4=";
1818 };
1919
2020 patches = [