Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ma27 merged 3 commits into from
Dec 9, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db6c4b1
element-desktop: 1.7.14 -> 1.7.15
Ma27 Dec 9, 2020
0d5608d
element-web: 1.7.14 -> 1.7.15
Ma27 Dec 9, 2020
917cac4
matrix-synapse: 1.23.0 -> 1.24.0
Ma27 Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.14",
"version": "1.7.15",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
"type": "git",
"url": "https://github.com/vector-im/riot-desktop"
"url": "https://github.com/vector-im/element-desktop"
},
"license": "Apache-2.0",
"files": [],
Expand All @@ -21,7 +21,7 @@
"build32": "electron-builder --ia32",
"build64": "electron-builder --x64",
"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": "scripts/in-docker.sh yarn run build",
"docker:install": "scripts/in-docker.sh yarn install",
Expand Down Expand Up @@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "10.1.3",
"electronVersion": "10.1.6",
"files": [
"package.json",
{
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

let
executableName = "element-desktop";
version = "1.7.14";
version = "1.7.15";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
repo = "element-desktop";
rev = "v${version}";
sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv";
sha256 = "sha256-7kWf8MXSB4/sX1bjMsfkzgzElS/AYu5VHAKGcqgvH54=";
};
electron = electron_9;

Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/instant-messengers/element/element-web.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.14";
version = "1.7.15";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j";
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-ZSi0OLA5dyPXn1NlZkkhCmWhrSryfyj/O6Ux1lO12ns=";
};

installPhase = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.23.0";
version = "1.24.0";

src = fetchPypi {
inherit pname version;
sha256 = "18an6nvxq2g21rq5ph3xlnkl75dmilcrz4ykdydz37hs09z6q1al";
sha256 = "sha256-yxcdFd7iVXbDIUx1lW73FKLy+BZfSspz60LKw7BCtl4=";
};

patches = [
Expand Down