diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-20 21:31:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-20 21:31:59 -0400 |
commit | c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1 (patch) | |
tree | ea09bf0f63e54cc75a4bca9176e83bc3ffa121bb | |
parent | ee5bcfff932fe679342099e58f9e3dad71d5e0ac (diff) | |
parent | a1cb6d601d157f73581ebf6b071f78e01a8b8562 (diff) | |
download | nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.tar nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.tar.gz nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.tar.bz2 nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.tar.lz nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.tar.xz nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.tar.zst nixpkgs-c55a88fe8f81f7835a7e9c9c5678f0cd14d833f1.zip |
Merge pull request #65107 from pacien/riot-1.3.0
riot-{web,desktop}: 1.2.2 -> 1.3.0
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 7c348b88c8a..edf10ed2cb4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.2", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index d6dcd0ee2ef..7400393d92b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.2.2"; + version = "1.3.0"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0ak1icl3apqn1b210jqj9ysnn40808lzrdwibdmv47c30hhq10fb"; + sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; }; in mkYarnPackage rec { @@ -81,7 +81,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = https://about.riot.im/; license = licenses.asl20; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien worldofpeace ]; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2d6c0df412a..9a2e2df80f2 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "19nb6gyjaijah068ika6hvk18hraivm71830i9cd4ssl6g5j4k8x"; + sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; }; installPhase = let |