aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/networking/instant-messengers/riot
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers/riot')
-rw-r--r--nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json5
-rw-r--r--nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix16
-rw-r--r--nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix4
-rw-r--r--nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix4
4 files changed, 15 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 959b99e68f6..acb63ff7454 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.6.2",
+ "version": "1.6.4",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -14,6 +14,7 @@
"scripts": {
"mkdirs": "mkdirp packages deploys",
"fetch": "yarn run mkdirs && node scripts/fetch-package.js",
+ "asar-webapp": "asar p webapp webapp.asar",
"start": "electron .",
"lint": "eslint src/ scripts/ hak/",
"build:native": "yarn run hak",
@@ -47,7 +48,7 @@
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
- "matrix-js-sdk": "6.1.0",
+ "matrix-js-sdk": "6.2.1",
"mkdirp": "^1.0.3",
"needle": "^2.3.2",
"node-pre-gyp": "^0.14.0",
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
index 4aa56181c4c..e6573a50818 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
@@ -146,11 +146,11 @@
};
}
{
- name = "acorn___acorn_6.4.0.tgz";
+ name = "acorn___acorn_6.4.1.tgz";
path = fetchurl {
- name = "acorn___acorn_6.4.0.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz";
- sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784";
+ name = "acorn___acorn_6.4.1.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz";
+ sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474";
};
}
{
@@ -3154,11 +3154,11 @@
};
}
{
- name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz";
+ name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
path = fetchurl {
- name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz";
- url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz";
- sha1 = "c28ad67c113c4aa9c8bce409c7ba550170bdc2ee";
+ name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
+ url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz";
+ sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b";
};
}
{
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index e5b815e7c88..64652afd7e4 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "riot-desktop";
- version = "1.6.2";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
- sha256 = "1anmch9z3na7rphxb0p9cnk55388z22iwfnfjhmjps1ii5wx4rls";
+ sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2";
};
electron = electron_7;
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index e61237dbb69..942917a4675 100644
--- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "riot-web";
- version = "1.6.2";
+ version = "1.6.4";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "1cyjw3x9yh96cn84r95zziwxgifkmzd5kdf4l69b7mwnqcr78dp0";
+ sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2";
};
installPhase = ''