cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #67293 from pacien/riot-v1.3.3

Browse source 
riot-{web,desktop}: 1.3.0 -> 1.3.3
This commit is contained in:
worldofpeace 2019-08-22 16:29:28 -04:00 committed by GitHub
commit 23dfcf42db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View file

@ -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": {

11
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file

@ -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;
};
}

4
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file

@ -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