about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-12-09 19:13:09 +0100
committerGitHub <noreply@github.com>2020-12-09 19:13:09 +0100
commitace2457eafa8169ed9495251d28371b37eb71fa5 (patch)
tree2f40f5fdf14f7c5f123ce21811fc81af18daeeff /pkgs/applications/networking/instant-messengers
parentb8936e55235bb4a970514d4bb9fbd77a2c16b806 (diff)
parent917cac46631803099c9ff414ac77964eee615365 (diff)
downloadnixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.tar
nixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.tar.gz
nixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.tar.bz2
nixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.tar.lz
nixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.tar.xz
nixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.tar.zst
nixlib-ace2457eafa8169ed9495251d28371b37eb71fa5.zip
Merge pull request #106436 from Ma27/matrix-updates
matrix-synapse: 1.23.0 -> 1.24.0, element-*: 1.7.14 -> 1.7.15
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r--pkgs/applications/networking/instant-messengers/element/element-desktop-package.json8
-rw-r--r--pkgs/applications/networking/instant-messengers/element/element-desktop.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/element/element-web.nix6
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index f2d882ad75e4..2bc223d5c618 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -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": [],
@@ -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",
@@ -62,7 +62,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "10.1.3",
+    "electronVersion": "10.1.6",
     "files": [
       "package.json",
       {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 9a3dab920f40..d5dac9655ef4 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -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;
 
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 46ac18af9ee5..44233d464758 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -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 = ''