public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60815 from pacien/riot-v1.0.8

Browse Source 
riot-desktop: 1.0.7 -> 1.0.8
This commit is contained in:
worldofpeace 2019-05-02 20:21:43 -04:00 committed by GitHub
commit d3a3ea0257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 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", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.0.7", "version": "1.0.8",
"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": {

7
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View File

@ -1,15 +1,18 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: { pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }:
# Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync.
with (import ./yarn2nix.nix { inherit pkgs; }); with (import ./yarn2nix.nix { inherit pkgs; });
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.0.7"; version = "1.0.8";
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 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58"; sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {

5
pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View File

@ -1,5 +1,8 @@
{ lib, stdenv, fetchurl, writeText, conf ? null }: { lib, stdenv, fetchurl, writeText, conf ? null }:
# Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync.
let configFile = writeText "riot-config.json" conf; in let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name= "riot-web-${version}"; name= "riot-web-${version}";
@ -19,7 +22,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A glossy Matrix collaboration client for the web"; description = "A glossy Matrix collaboration client for the web";
homepage = http://riot.im/; homepage = http://riot.im/;
maintainers = with stdenv.lib.maintainers; [ bachp ]; maintainers = with stdenv.lib.maintainers; [ bachp pacien ];
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
hydraPlatforms = []; hydraPlatforms = [];