From 1fc56f7789650e93df737066f9b9405299673a55 Mon Sep 17 00:00:00 2001 From: pacien Date: Thu, 2 May 2019 22:41:01 +0200 Subject: [PATCH 1/3] riot-web: add pacien as maintainer --- .../networking/instant-messengers/riot/riot-web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 9c15f8a750a..4a678668811 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = http://riot.im/; - maintainers = with stdenv.lib.maintainers; [ bachp ]; + maintainers = with stdenv.lib.maintainers; [ bachp pacien ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; From d0cc03e8a3f62acd8f7802f157335416718831cc Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 3 May 2019 00:55:30 +0200 Subject: [PATCH 2/3] riot-desktop: 1.0.7 -> 1.0.8 --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 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 ee6a40e5860..f195a0cb955 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.0.7", + "version": "1.0.8", "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 3db537938da..35ee3252c27 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -4,12 +4,12 @@ with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; - version = "1.0.7"; + version = "1.0.8"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1sq6vnyas2ab3phaiyby4fkpp0nwvl67xwxnr2pzfm0dkjxl9r58"; + sha256 = "1krp608wxff1siih8zknc425n0qb6qjzf854fnp7qyjp1cnfc9sb"; }; in mkYarnPackage rec { From 2e9c8649f74c85d9ee114e564dffb05a5e00fbf0 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 3 May 2019 00:59:48 +0200 Subject: [PATCH 3/3] riot: add maintainer note --- .../networking/instant-messengers/riot/riot-desktop.nix | 3 +++ .../networking/instant-messengers/riot/riot-web.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 35ee3252c27..6209dc4b0bf 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,5 +1,8 @@ { 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; }); let diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 4a678668811..d46c886a156 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,5 +1,8 @@ { 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 stdenv.mkDerivation rec { name= "riot-web-${version}";