diff options
| author | pacien <pacien.trangirard@pacien.net> | 2020-03-05 23:16:31 +0100 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-03-05 14:57:21 -0800 |
| commit | abc58dc1d0d233f62b909a71305533d965131c6a (patch) | |
| tree | 412d55daf654d9b835db5c1877f4d8f72fa08a43 /pkgs/applications/networking/instant-messengers/riot | |
| parent | 18848216eaf556a3f2b1fe14294bf6f3bd0577ce (diff) | |
| download | nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.tar nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.tar.gz nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.tar.bz2 nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.tar.lz nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.tar.xz nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.tar.zst nixlib-abc58dc1d0d233f62b909a71305533d965131c6a.zip | |
riot-desktop: 1.5.10 -> 1.5.12
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/riot')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 11 |
2 files changed, 7 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 3dc7c79b00b9..418375e80c36 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.5.10", + "version": "1.5.12", "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 f94d7ad165db..122a7e74f863 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_5, riot-web, mkYarnPackage }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -6,13 +6,14 @@ let executableName = "riot-desktop"; - version = "1.5.10"; + version = "1.5.12"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j"; + sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym"; }; + electron = electron_7; in mkYarnPackage rec { name = "riot-desktop-${version}"; @@ -45,7 +46,7 @@ in mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper - makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" ''; @@ -78,6 +79,6 @@ in mkYarnPackage rec { homepage = https://about.riot.im/; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; - inherit (electron_5.meta) platforms; + inherit (electron.meta) platforms; }; } |