Merge pull request #65107 from pacien/riot-1.3.0

riot-{web,desktop}: 1.2.2 -> 1.3.0
This commit is contained in:
worldofpeace 2019-07-20 21:31:59 -04:00 committed by GitHub
commit c55a88fe8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.2.2", "version": "1.3.0",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"dependencies": { "dependencies": {

View File

@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.2.2"; version = "1.3.0";
riot-web-src = fetchFromGitHub { riot-web-src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "riot-web"; repo = "riot-web";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb"; sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
@ -81,7 +81,7 @@ in mkYarnPackage rec {
description = "A feature-rich client for Matrix.org"; description = "A feature-rich client for Matrix.org";
homepage = https://about.riot.im/; homepage = https://about.riot.im/;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ pacien ]; maintainers = with maintainers; [ pacien worldofpeace ];
inherit (electron.meta) platforms; inherit (electron.meta) platforms;
}; };
} }

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name= "riot-web-${version}"; name= "riot-web-${version}";
version = "1.2.2"; version = "1.3.0";
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/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq";
}; };
installPhase = let installPhase = let