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

Merge pull request #80357 from pacien/riot-v1.5.9 

riot-{web,desktop}: 1.5.8 -> 1.5.9
This commit is contained in:
worldofpeace 2020-02-17 19:59:56 -05:00 committed by GitHub
parent 11342b9ecf 5bd923057c
commit 720fe8592c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 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.5.6", "version": "1.5.9",
"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": {

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

@ -6,12 +6,12 @@
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.5.6"; version = "1.5.9";
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 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk"; sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
@ -29,7 +29,6 @@ in mkYarnPackage rec {
# resources # resources
mkdir -p "$out/share/riot" mkdir -p "$out/share/riot"
ln -s '${riot-web}' "$out/share/riot/webapp" ln -s '${riot-web}' "$out/share/riot/webapp"
cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
cp -r './deps/riot-web' "$out/share/riot/electron" cp -r './deps/riot-web' "$out/share/riot/electron"
cp -r './deps/riot-web/img' "$out/share/riot" cp -r './deps/riot-web/img' "$out/share/riot"
rm "$out/share/riot/electron/node_modules" rm "$out/share/riot/electron/node_modules"

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

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "riot-web"; pname = "riot-web";
version = "1.5.8"; version = "1.5.9";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys";
}; };
installPhase = '' installPhase = ''