diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-22 16:29:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-22 16:29:28 -0400 |
commit | 23dfcf42dbba3ebd258c163c9a7b082e4e450682 (patch) | |
tree | 1dc3cea3e070989a3b6f1dbae46d34898b4fd53c | |
parent | b51004af1ce61bf4f541ea8a26e1687778177f24 (diff) | |
parent | cdab5bd9e5a91e08e42721b28c2bf6bde8591421 (diff) | |
download | nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.tar nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.tar.gz nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.tar.bz2 nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.tar.lz nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.tar.xz nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.tar.zst nixlib-23dfcf42dbba3ebd258c163c9a7b082e4e450682.zip |
Merge pull request #67293 from pacien/riot-v1.3.3
riot-{web,desktop}: 1.3.0 -> 1.3.3
3 files changed, 8 insertions, 9 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 edf10ed2cb42..2e9602458e7f 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.3.0", + "version": "1.3.3", "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 894e51529e66..d245fad7bca5 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web }: # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.3.0"; + version = "1.3.3"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; + sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; }; in mkYarnPackage rec { @@ -49,7 +49,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" ''; @@ -82,7 +82,6 @@ in mkYarnPackage rec { homepage = https://about.riot.im/; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; - inherit (electron.meta) platforms; + inherit (electron_5.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 9a2e2df80f29..383952f2a893 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.3.0"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1rppxcc4m00bf73ghgli967wwrri2jdj865623pn8nk4kny4wxyq"; + sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; }; installPhase = let |