git.iko.soy/typeable/nixpkgs
on master help sign in
element-desktop, element-web: init at 1.7.0
commita705201e1d771444667c59c8cc2357c4afb88e21 authorclaudiiii <claudi+github@grimm.link> dateWed 15 Jul 2020, 22:39 (6 years ago) parentb314827
8 files changed+360−208
pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json → pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+15−14 pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix → pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix+288−136 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix → pkgs/applications/networking/instant-messengers/element/element-desktop.nix+26−29 pkgs/applications/networking/instant-messengers/riot/riot-web.nix → pkgs/applications/networking/instant-messengers/element/element-web.nix+6−6 pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh+17 pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh−17 pkgs/top-level/aliases.nix+2 pkgs/top-level/all-packages.nix+6−6
pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json → pkgs/applications/networking/instant-messengers/element/element-desktop-package.jsonrenamed+15−14
@@ -1,10 +1,10 @@
11{
2− "name": "riot-desktop",
3− "productName": "Riot",
2+ "name": "element-desktop",
3+ "productName": "Element (Riot)",
44 "main": "src/electron-main.js",
5− "version": "1.6.7",
5+ "version": "1.7.0",
66 "description": "A feature-rich client for Matrix.org",
7− "author": "New Vector Ltd.",
7+ "author": "Element",
88 "repository": {
99 "type": "git",
1010 "url": "https://github.com/vector-im/riot-desktop"
@@ -38,8 +38,8 @@
3838 },
3939 "devDependencies": {
4040 "asar": "^2.0.1",
41− "electron-builder": "^22.3.2",
42− "electron-builder-squirrel-windows": "^22.3.2",
41+ "electron-builder": "^22.7.0",
42+ "electron-builder-squirrel-windows": "^22.7.0",
4343 "electron-devtools-installer": "^2.2.4",
4444 "electron-notarize": "^0.2.0",
4545 "eslint": "^5.8.0",
@@ -48,22 +48,22 @@
4848 "find-npm-prefix": "^1.0.2",
4949 "fs-extra": "^8.1.0",
5050 "glob": "^7.1.6",
51− "matrix-js-sdk": "7.0.0",
51+ "matrix-js-sdk": "7.1.0",
5252 "mkdirp": "^1.0.3",
5353 "needle": "^2.5.0",
5454 "node-pre-gyp": "^0.15.0",
55− "npm": "^6.13.7",
55+ "npm": "^6.14.6",
5656 "rimraf": "^3.0.2",
5757 "semver": "^7.1.3",
5858 "tar": "^6.0.1"
5959 },
6060 "hakDependencies": {
61− "matrix-seshat": "^1.3.3",
61+ "matrix-seshat": "^2.1.0",
6262 "keytar": "^5.6.0"
6363 },
6464 "build": {
6565 "appId": "im.riot.app",
66− "electronVersion": "8.0.3",
66+ "electronVersion": "9.0.5",
6767 "files": [
6868 "package.json",
6969 {
@@ -82,9 +82,9 @@
8282 "linux": {
8383 "target": "deb",
8484 "category": "Network;InstantMessaging;Chat",
85− "maintainer": "support@riot.im",
85+ "maintainer": "support@element.io",
8686 "desktop": {
87− "StartupWMClass": "riot"
87+ "StartupWMClass": "element"
8888 }
8989 },
9090 "mac": {
@@ -100,12 +100,13 @@
100100 "directories": {
101101 "output": "dist"
102102 },
103+ "afterPack": "scripts/electron_afterPack",
103104 "afterSign": "scripts/electron_afterSign",
104105 "protocols": [
105106 {
106− "name": "riot",
107+ "name": "element",
107108 "schemes": [
108− "riot"
109+ "element"
109110 ]
110111 }
111112 ]
pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix → pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nixrenamed+288−136
@@ -1,14 +1,6 @@
11{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
22 offline_cache = linkFarm "offline" packages;
33 packages = [
4− {
5− name = "7zip_bin___7zip_bin_4.0.2.tgz";
6− path = fetchurl {
7− name = "7zip_bin___7zip_bin_4.0.2.tgz";
8− url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.0.2.tgz";
9− sha1 = "6abbdc22f33cab742053777a26db2e25ca527179";
10− };
11− }
124 {
135 name = "7zip_bin___7zip_bin_5.0.3.tgz";
146 path = fetchurl {
@@ -50,11 +42,11 @@
5042 };
5143 }
5244 {
53− name = "_develar_schema_utils___schema_utils_2.1.0.tgz";
45+ name = "_develar_schema_utils___schema_utils_2.6.5.tgz";
5446 path = fetchurl {
55− name = "_develar_schema_utils___schema_utils_2.1.0.tgz";
56− url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz";
57− sha1 = "eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17";
47+ name = "_develar_schema_utils___schema_utils_2.6.5.tgz";
48+ url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz";
49+ sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6";
5850 };
5951 }
6052 {
@@ -98,11 +90,11 @@
9890 };
9991 }
10092 {
101− name = "_types_fs_extra___fs_extra_8.0.1.tgz";
93+ name = "_types_fs_extra___fs_extra_9.0.1.tgz";
10294 path = fetchurl {
103− name = "_types_fs_extra___fs_extra_8.0.1.tgz";
104− url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.0.1.tgz";
105− sha1 = "a2378d6e7e8afea1564e44aafa2e207dadf77686";
95+ name = "_types_fs_extra___fs_extra_9.0.1.tgz";
96+ url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz";
97+ sha1 = "91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918";
10698 };
10799 }
108100 {
@@ -121,6 +113,22 @@
121113 sha1 = "7cc1358c9c18e71f6c020e410962971863232cf5";
122114 };
123115 }
116+ {
117+ name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
118+ path = fetchurl {
119+ name = "_types_yargs_parser___yargs_parser_15.0.0.tgz";
120+ url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
121+ sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d";
122+ };
123+ }
124+ {
125+ name = "_types_yargs___yargs_15.0.5.tgz";
126+ path = fetchurl {
127+ name = "_types_yargs___yargs_15.0.5.tgz";
128+ url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz";
129+ sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79";
130+ };
131+ }
124132 {
125133 name = "JSONStream___JSONStream_1.3.5.tgz";
126134 path = fetchurl {
@@ -193,6 +201,14 @@
193201 sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52";
194202 };
195203 }
204+ {
205+ name = "ajv___ajv_6.12.2.tgz";
206+ path = fetchurl {
207+ name = "ajv___ajv_6.12.2.tgz";
208+ url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz";
209+ sha1 = "c629c5eced17baf314437918d2da88c99d5958cd";
210+ };
211+ }
196212 {
197213 name = "another_json___another_json_0.2.0.tgz";
198214 path = fetchurl {
@@ -290,27 +306,19 @@
290306 };
291307 }
292308 {
293− name = "app_builder_bin___app_builder_bin_3.5.2.tgz";
294− path = fetchurl {
295− name = "app_builder_bin___app_builder_bin_3.5.2.tgz";
296− url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.2.tgz";
297− sha1 = "fba56e6e9ef76fcd37816738c5f9a0b3992d7183";
298− };
299− }
300− {
301− name = "app_builder_lib___app_builder_lib_22.3.2.tgz";
309+ name = "app_builder_bin___app_builder_bin_3.5.9.tgz";
302310 path = fetchurl {
303− name = "app_builder_lib___app_builder_lib_22.3.2.tgz";
304− url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.2.tgz";
305− sha1 = "d43e0bdff91d484c0bd07d7248043dbb2665b8ac";
311+ name = "app_builder_bin___app_builder_bin_3.5.9.tgz";
312+ url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz";
313+ sha1 = "a3ac0c25286bac68357321cb2eaf7128b0bc0a4f";
306314 };
307315 }
308316 {
309− name = "app_builder_lib___app_builder_lib_22.3.3.tgz";
317+ name = "app_builder_lib___app_builder_lib_22.7.0.tgz";
310318 path = fetchurl {
311− name = "app_builder_lib___app_builder_lib_22.3.3.tgz";
312− url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.3.3.tgz";
313− sha1 = "9a95a3c14f69fb6131834dd840fba561191c9998";
319+ name = "app_builder_lib___app_builder_lib_22.7.0.tgz";
320+ url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.7.0.tgz";
321+ sha1 = "ccd3e7ece2d46bc209423a77aa142f74aaf65db0";
314322 };
315323 }
316324 {
@@ -346,11 +354,11 @@
346354 };
347355 }
348356 {
349− name = "archiver___archiver_3.1.1.tgz";
357+ name = "archiver___archiver_4.0.1.tgz";
350358 path = fetchurl {
351− name = "archiver___archiver_3.1.1.tgz";
352− url = "https://registry.yarnpkg.com/archiver/-/archiver-3.1.1.tgz";
353− sha1 = "9db7819d4daf60aec10fe86b16cb9258ced66ea0";
359+ name = "archiver___archiver_4.0.1.tgz";
360+ url = "https://registry.yarnpkg.com/archiver/-/archiver-4.0.1.tgz";
361+ sha1 = "3f722b121777e361ca9fad374ecda38e77e63c7f";
354362 };
355363 }
356364 {
@@ -425,6 +433,14 @@
425433 sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3";
426434 };
427435 }
436+ {
437+ name = "async___async_0.9.2.tgz";
438+ path = fetchurl {
439+ name = "async___async_0.9.2.tgz";
440+ url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz";
441+ sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
442+ };
443+ }
428444 {
429445 name = "async___async_2.6.3.tgz";
430446 path = fetchurl {
@@ -441,6 +457,14 @@
441457 sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
442458 };
443459 }
460+ {
461+ name = "at_least_node___at_least_node_1.0.0.tgz";
462+ path = fetchurl {
463+ name = "at_least_node___at_least_node_1.0.0.tgz";
464+ url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz";
465+ sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2";
466+ };
467+ }
444468 {
445469 name = "auto_launch___auto_launch_5.0.5.tgz";
446470 path = fetchurl {
@@ -514,11 +538,11 @@
514538 };
515539 }
516540 {
517− name = "bl___bl_3.0.0.tgz";
541+ name = "bl___bl_4.0.2.tgz";
518542 path = fetchurl {
519− name = "bl___bl_3.0.0.tgz";
520− url = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz";
521− sha1 = "3611ec00579fd18561754360b21e9f784500ff88";
543+ name = "bl___bl_4.0.2.tgz";
544+ url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz";
545+ sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a";
522546 };
523547 }
524548 {
@@ -618,27 +642,27 @@
618642 };
619643 }
620644 {
621− name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz";
645+ name = "buffer___buffer_5.6.0.tgz";
622646 path = fetchurl {
623− name = "builder_util_runtime___builder_util_runtime_8.6.0.tgz";
624− url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.0.tgz";
625− sha1 = "b7007c30126da9a90e99932128d2922c8c178649";
647+ name = "buffer___buffer_5.6.0.tgz";
648+ url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz";
649+ sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786";
626650 };
627651 }
628652 {
629− name = "builder_util___builder_util_22.3.2.tgz";
653+ name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz";
630654 path = fetchurl {
631− name = "builder_util___builder_util_22.3.2.tgz";
632− url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.2.tgz";
633− sha1 = "23c61aaf0f0006f994087b33a26e47cdaec7aa8d";
655+ name = "builder_util_runtime___builder_util_runtime_8.7.1.tgz";
656+ url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz";
657+ sha1 = "23c808cddd650d4376a7a1518ec1e80e85c10f00";
634658 };
635659 }
636660 {
637− name = "builder_util___builder_util_22.3.3.tgz";
661+ name = "builder_util___builder_util_22.7.0.tgz";
638662 path = fetchurl {
639− name = "builder_util___builder_util_22.3.3.tgz";
640− url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.3.3.tgz";
641− sha1 = "62f0527ceaa1a2e4a60596a9b38ad1ffe3e20ae6";
663+ name = "builder_util___builder_util_22.7.0.tgz";
664+ url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.7.0.tgz";
665+ sha1 = "0776a66e6d6e408a78bed7f17a7ad22516d9e7f0";
642666 };
643667 }
644668 {
@@ -745,6 +769,14 @@
745769 sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4";
746770 };
747771 }
772+ {
773+ name = "chalk___chalk_4.1.0.tgz";
774+ path = fetchurl {
775+ name = "chalk___chalk_4.1.0.tgz";
776+ url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz";
777+ sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a";
778+ };
779+ }
748780 {
749781 name = "chardet___chardet_0.7.0.tgz";
750782 path = fetchurl {
@@ -970,11 +1002,11 @@
9701002 };
9711003 }
9721004 {
973− name = "compress_commons___compress_commons_2.1.1.tgz";
1005+ name = "compress_commons___compress_commons_3.0.0.tgz";
9741006 path = fetchurl {
975− name = "compress_commons___compress_commons_2.1.1.tgz";
976− url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-2.1.1.tgz";
977− sha1 = "9410d9a534cf8435e3fbbb7c6ce48de2dc2f0610";
1007+ name = "compress_commons___compress_commons_3.0.0.tgz";
1008+ url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-3.0.0.tgz";
1009+ sha1 = "833944d84596e537224dd91cf92f5246823d4f1d";
9781010 };
9791011 }
9801012 {
@@ -1169,6 +1201,14 @@
11691201 sha1 = "3b72260255109c6b589cee050f1d516139664791";
11701202 };
11711203 }
1204+ {
1205+ name = "debug___debug_4.2.0.tgz";
1206+ path = fetchurl {
1207+ name = "debug___debug_4.2.0.tgz";
1208+ url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz";
1209+ sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1";
1210+ };
1211+ }
11721212 {
11731213 name = "debuglog___debuglog_1.0.1.tgz";
11741214 path = fetchurl {
@@ -1298,11 +1338,11 @@
12981338 };
12991339 }
13001340 {
1301− name = "dmg_builder___dmg_builder_22.3.2.tgz";
1341+ name = "dmg_builder___dmg_builder_22.7.0.tgz";
13021342 path = fetchurl {
1303− name = "dmg_builder___dmg_builder_22.3.2.tgz";
1304− url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.3.2.tgz";
1305− sha1 = "4c052f75d601e3358da1ff9d7d57738e1c01b157";
1343+ name = "dmg_builder___dmg_builder_22.7.0.tgz";
1344+ url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.7.0.tgz";
1345+ sha1 = "ead7e7c046cbdc52d29d302a4455f6668cdf7d45";
13061346 };
13071347 }
13081348 {
@@ -1394,27 +1434,27 @@
13941434 };
13951435 }
13961436 {
1397− name = "ejs___ejs_3.0.1.tgz";
1437+ name = "ejs___ejs_3.1.3.tgz";
13981438 path = fetchurl {
1399− name = "ejs___ejs_3.0.1.tgz";
1400− url = "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz";
1401− sha1 = "30c8f6ee9948502cc32e85c37a3f8b39b5a614a5";
1439+ name = "ejs___ejs_3.1.3.tgz";
1440+ url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.3.tgz";
1441+ sha1 = "514d967a8894084d18d3d47bd169a1c0560f093d";
14021442 };
14031443 }
14041444 {
1405− name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz";
1445+ name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz";
14061446 path = fetchurl {
1407− name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.3.3.tgz";
1408− url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.3.3.tgz";
1409− sha1 = "0a417af35c83b067096bd3217b6b7bd75c6c48a9";
1447+ name = "electron_builder_squirrel_windows___electron_builder_squirrel_windows_22.7.0.tgz";
1448+ url = "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.7.0.tgz";
1449+ sha1 = "8d6f09d541c039f52202935c66d592c38575ceff";
14101450 };
14111451 }
14121452 {
1413− name = "electron_builder___electron_builder_22.3.2.tgz";
1453+ name = "electron_builder___electron_builder_22.7.0.tgz";
14141454 path = fetchurl {
1415− name = "electron_builder___electron_builder_22.3.2.tgz";
1416− url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz";
1417− sha1 = "902d150fc0670cb90213262e5e0aa3c4f299ffa4";
1455+ name = "electron_builder___electron_builder_22.7.0.tgz";
1456+ url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.7.0.tgz";
1457+ sha1 = "a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81";
14181458 };
14191459 }
14201460 {
@@ -1434,19 +1474,11 @@
14341474 };
14351475 }
14361476 {
1437− name = "electron_publish___electron_publish_22.3.2.tgz";
1477+ name = "electron_publish___electron_publish_22.7.0.tgz";
14381478 path = fetchurl {
1439− name = "electron_publish___electron_publish_22.3.2.tgz";
1440− url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.2.tgz";
1441− sha1 = "d2e60caf7a9643fe57e501c20acaf32c737b1c50";
1442− };
1443− }
1444− {
1445− name = "electron_publish___electron_publish_22.3.3.tgz";
1446− path = fetchurl {
1447− name = "electron_publish___electron_publish_22.3.3.tgz";
1448− url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.3.3.tgz";
1449− sha1 = "7d1e757a20ce0558fdc42900b6e3d773fdae9d9e";
1479+ name = "electron_publish___electron_publish_22.7.0.tgz";
1480+ url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.7.0.tgz";
1481+ sha1 = "d92ba7c4007c9ac1dd070593e48028184fb2dc19";
14501482 };
14511483 }
14521484 {
@@ -1753,6 +1785,14 @@
17531785 sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
17541786 };
17551787 }
1788+ {
1789+ name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
1790+ path = fetchurl {
1791+ name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz";
1792+ url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
1793+ sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525";
1794+ };
1795+ }
17561796 {
17571797 name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
17581798 path = fetchurl {
@@ -1801,6 +1841,14 @@
18011841 sha1 = "257a078384d1db8087bc449d107d52a52672b9e9";
18021842 };
18031843 }
1844+ {
1845+ name = "filelist___filelist_1.0.1.tgz";
1846+ path = fetchurl {
1847+ name = "filelist___filelist_1.0.1.tgz";
1848+ url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz";
1849+ sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb";
1850+ };
1851+ }
18041852 {
18051853 name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz";
18061854 path = fetchurl {
@@ -1905,6 +1953,14 @@
19051953 sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0";
19061954 };
19071955 }
1956+ {
1957+ name = "fs_extra___fs_extra_9.0.1.tgz";
1958+ path = fetchurl {
1959+ name = "fs_extra___fs_extra_9.0.1.tgz";
1960+ url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz";
1961+ sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc";
1962+ };
1963+ }
19081964 {
19091965 name = "fs_minipass___fs_minipass_1.2.7.tgz";
19101966 path = fetchurl {
@@ -2097,6 +2153,14 @@
20972153 sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
20982154 };
20992155 }
2156+ {
2157+ name = "graceful_fs___graceful_fs_4.2.4.tgz";
2158+ path = fetchurl {
2159+ name = "graceful_fs___graceful_fs_4.2.4.tgz";
2160+ url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz";
2161+ sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb";
2162+ };
2163+ }
21002164 {
21012165 name = "har_schema___har_schema_2.0.0.tgz";
21022166 path = fetchurl {
@@ -2170,11 +2234,19 @@
21702234 };
21712235 }
21722236 {
2173− name = "hosted_git_info___hosted_git_info_3.0.2.tgz";
2237+ name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
21742238 path = fetchurl {
2175− name = "hosted_git_info___hosted_git_info_3.0.2.tgz";
2176− url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.2.tgz";
2177− sha1 = "8b7e3bd114b59b51786f8bade0f39ddc80275a97";
2239+ name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
2240+ url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
2241+ sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488";
2242+ };
2243+ }
2244+ {
2245+ name = "hosted_git_info___hosted_git_info_3.0.4.tgz";
2246+ path = fetchurl {
2247+ name = "hosted_git_info___hosted_git_info_3.0.4.tgz";
2248+ url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz";
2249+ sha1 = "be4973eb1fd2737b11c9c7c19380739bb249f60d";
21782250 };
21792251 }
21802252 {
@@ -2626,11 +2698,11 @@
26262698 };
26272699 }
26282700 {
2629− name = "isbinaryfile___isbinaryfile_4.0.4.tgz";
2701+ name = "isbinaryfile___isbinaryfile_4.0.6.tgz";
26302702 path = fetchurl {
2631− name = "isbinaryfile___isbinaryfile_4.0.4.tgz";
2632− url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.4.tgz";
2633− sha1 = "6803f81a8944201c642b6e17da041e24deb78712";
2703+ name = "isbinaryfile___isbinaryfile_4.0.6.tgz";
2704+ url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz";
2705+ sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b";
26342706 };
26352707 }
26362708 {
@@ -2649,6 +2721,14 @@
26492721 sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
26502722 };
26512723 }
2724+ {
2725+ name = "jake___jake_10.8.2.tgz";
2726+ path = fetchurl {
2727+ name = "jake___jake_10.8.2.tgz";
2728+ url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz";
2729+ sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b";
2730+ };
2731+ }
26522732 {
26532733 name = "jimp___jimp_0.2.28.tgz";
26542734 path = fetchurl {
@@ -2681,6 +2761,14 @@
26812761 sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
26822762 };
26832763 }
2764+ {
2765+ name = "js_yaml___js_yaml_3.14.0.tgz";
2766+ path = fetchurl {
2767+ name = "js_yaml___js_yaml_3.14.0.tgz";
2768+ url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz";
2769+ sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482";
2770+ };
2771+ }
26842772 {
26852773 name = "jsbn___jsbn_0.1.1.tgz";
26862774 path = fetchurl {
@@ -2738,11 +2826,11 @@
27382826 };
27392827 }
27402828 {
2741− name = "json5___json5_2.1.1.tgz";
2829+ name = "json5___json5_2.1.3.tgz";
27422830 path = fetchurl {
2743− name = "json5___json5_2.1.1.tgz";
2744− url = "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz";
2745− sha1 = "81b6cb04e9ba496f1c7005d07b4368a2638f90b6";
2831+ name = "json5___json5_2.1.3.tgz";
2832+ url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz";
2833+ sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43";
27462834 };
27472835 }
27482836 {
@@ -2761,6 +2849,14 @@
27612849 sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
27622850 };
27632851 }
2852+ {
2853+ name = "jsonfile___jsonfile_6.0.1.tgz";
2854+ path = fetchurl {
2855+ name = "jsonfile___jsonfile_6.0.1.tgz";
2856+ url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz";
2857+ sha1 = "98966cba214378c8c84b82e085907b40bf614179";
2858+ };
2859+ }
27642860 {
27652861 name = "jsonparse___jsonparse_1.3.1.tgz";
27662862 path = fetchurl {
@@ -3154,11 +3250,11 @@
31543250 };
31553251 }
31563252 {
3157− name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz";
3253+ name = "matrix_js_sdk___matrix_js_sdk_7.1.0.tgz";
31583254 path = fetchurl {
3159− name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz";
3160− url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0.tgz";
3161− sha1 = "da2b24e57574379c3d8f7065eb68ea6c479d9806";
3255+ name = "matrix_js_sdk___matrix_js_sdk_7.1.0.tgz";
3256+ url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0.tgz";
3257+ sha1 = "b3e3304e890df45c827706831748935168ee839f";
31623258 };
31633259 }
31643260 {
@@ -3210,11 +3306,11 @@
32103306 };
32113307 }
32123308 {
3213− name = "mime___mime_2.4.4.tgz";
3309+ name = "mime___mime_2.4.6.tgz";
32143310 path = fetchurl {
3215− name = "mime___mime_2.4.4.tgz";
3216− url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz";
3217− sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5";
3311+ name = "mime___mime_2.4.6.tgz";
3312+ url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz";
3313+ sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1";
32183314 };
32193315 }
32203316 {
@@ -3425,6 +3521,14 @@
34253521 sha1 = "8e31260a7af4a2e2f994b0673d4e0b3866156332";
34263522 };
34273523 }
3524+ {
3525+ name = "node_gyp___node_gyp_5.1.1.tgz";
3526+ path = fetchurl {
3527+ name = "node_gyp___node_gyp_5.1.1.tgz";
3528+ url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz";
3529+ sha1 = "eb915f7b631c937d282e33aed44cb7a025f62a3e";
3530+ };
3531+ }
34283532 {
34293533 name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz";
34303534 path = fetchurl {
@@ -3441,6 +3545,14 @@
34413545 sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
34423546 };
34433547 }
3548+ {
3549+ name = "nopt___nopt_4.0.3.tgz";
3550+ path = fetchurl {
3551+ name = "nopt___nopt_4.0.3.tgz";
3552+ url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz";
3553+ sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48";
3554+ };
3555+ }
34443556 {
34453557 name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
34463558 path = fetchurl {
@@ -3553,6 +3665,14 @@
35533665 sha1 = "8272a71c19634d0dce9c35a5daf8ee589cbb0f52";
35543666 };
35553667 }
3668+ {
3669+ name = "npm_profile___npm_profile_4.0.4.tgz";
3670+ path = fetchurl {
3671+ name = "npm_profile___npm_profile_4.0.4.tgz";
3672+ url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.4.tgz";
3673+ sha1 = "28ee94390e936df6d084263ee2061336a6a1581b";
3674+ };
3675+ }
35563676 {
35573677 name = "npm_registry_fetch___npm_registry_fetch_4.0.2.tgz";
35583678 path = fetchurl {
@@ -3561,6 +3681,14 @@
35613681 sha1 = "2b1434f93ccbe6b6385f8e45f45db93e16921d7a";
35623682 };
35633683 }
3684+ {
3685+ name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz";
3686+ path = fetchurl {
3687+ name = "npm_registry_fetch___npm_registry_fetch_4.0.5.tgz";
3688+ url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz";
3689+ sha1 = "cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa";
3690+ };
3691+ }
35643692 {
35653693 name = "npm_run_path___npm_run_path_2.0.2.tgz";
35663694 path = fetchurl {
@@ -3578,11 +3706,11 @@
35783706 };
35793707 }
35803708 {
3581− name = "npm___npm_6.13.7.tgz";
3709+ name = "npm___npm_6.14.6.tgz";
35823710 path = fetchurl {
3583− name = "npm___npm_6.13.7.tgz";
3584− url = "https://registry.yarnpkg.com/npm/-/npm-6.13.7.tgz";
3585− sha1 = "9533a3ddc57f9792db8a8b303efabaf878047841";
3711+ name = "npm___npm_6.14.6.tgz";
3712+ url = "https://registry.yarnpkg.com/npm/-/npm-6.14.6.tgz";
3713+ sha1 = "1a81ce1fac2bf5457dbf6342ceed503627ff228f";
35863714 };
35873715 }
35883716 {
@@ -4242,11 +4370,11 @@
42424370 };
42434371 }
42444372 {
4245− name = "read_config_file___read_config_file_5.0.1.tgz";
4373+ name = "read_config_file___read_config_file_6.0.0.tgz";
42464374 path = fetchurl {
4247− name = "read_config_file___read_config_file_5.0.1.tgz";
4248− url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.1.tgz";
4249− sha1 = "ead3df0d9822cc96006ca16322eaa79dac8591c2";
4375+ name = "read_config_file___read_config_file_6.0.0.tgz";
4376+ url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz";
4377+ sha1 = "224b5dca6a5bdc1fb19e63f89f342680efdb9299";
42504378 };
42514379 }
42524380 {
@@ -4321,6 +4449,14 @@
43214449 sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc";
43224450 };
43234451 }
4452+ {
4453+ name = "readable_stream___readable_stream_3.6.0.tgz";
4454+ path = fetchurl {
4455+ name = "readable_stream___readable_stream_3.6.0.tgz";
4456+ url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz";
4457+ sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198";
4458+ };
4459+ }
43244460 {
43254461 name = "readable_stream___readable_stream_1.1.14.tgz";
43264462 path = fetchurl {
@@ -4601,6 +4737,14 @@
46014737 sha1 = "e4345ce73071c53f336445cfc19efb1c311df2a6";
46024738 };
46034739 }
4740+ {
4741+ name = "semver___semver_7.3.2.tgz";
4742+ path = fetchurl {
4743+ name = "semver___semver_7.3.2.tgz";
4744+ url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz";
4745+ sha1 = "604962b052b81ed0786aae84389ffba70ffd3938";
4746+ };
4747+ }
46044748 {
46054749 name = "set_blocking___set_blocking_2.0.0.tgz";
46064750 path = fetchurl {
@@ -4698,11 +4842,11 @@
46984842 };
46994843 }
47004844 {
4701− name = "source_map_support___source_map_support_0.5.16.tgz";
4845+ name = "source_map_support___source_map_support_0.5.19.tgz";
47024846 path = fetchurl {
4703− name = "source_map_support___source_map_support_0.5.16.tgz";
4704− url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz";
4705− sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042";
4847+ name = "source_map_support___source_map_support_0.5.19.tgz";
4848+ url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz";
4849+ sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
47064850 };
47074851 }
47084852 {
@@ -4994,11 +5138,11 @@
49945138 };
49955139 }
49965140 {
4997− name = "tar_stream___tar_stream_2.1.0.tgz";
5141+ name = "tar_stream___tar_stream_2.1.2.tgz";
49985142 path = fetchurl {
4999− name = "tar_stream___tar_stream_2.1.0.tgz";
5000− url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz";
5001− sha1 = "d1aaa3661f05b38b5acc9b7020efdca5179a2cc3";
5143+ name = "tar_stream___tar_stream_2.1.2.tgz";
5144+ url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz";
5145+ sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325";
50025146 };
50035147 }
50045148 {
@@ -5018,11 +5162,11 @@
50185162 };
50195163 }
50205164 {
5021− name = "temp_file___temp_file_3.3.6.tgz";
5165+ name = "temp_file___temp_file_3.3.7.tgz";
50225166 path = fetchurl {
5023− name = "temp_file___temp_file_3.3.6.tgz";
5024− url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.6.tgz";
5025− sha1 = "bd7a1951338bf93b59380b498ec1804d5b76c449";
5167+ name = "temp_file___temp_file_3.3.7.tgz";
5168+ url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz";
5169+ sha1 = "686885d635f872748e384e871855958470aeb18a";
50265170 };
50275171 }
50285172 {
@@ -5257,6 +5401,14 @@
52575401 sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66";
52585402 };
52595403 }
5404+ {
5405+ name = "universalify___universalify_1.0.0.tgz";
5406+ path = fetchurl {
5407+ name = "universalify___universalify_1.0.0.tgz";
5408+ url = "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz";
5409+ sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d";
5410+ };
5411+ }
52605412 {
52615413 name = "unpipe___unpipe_1.0.0.tgz";
52625414 path = fetchurl {
@@ -5626,11 +5778,11 @@
56265778 };
56275779 }
56285780 {
5629− name = "yargs_parser___yargs_parser_16.1.0.tgz";
5781+ name = "yargs_parser___yargs_parser_18.1.3.tgz";
56305782 path = fetchurl {
5631− name = "yargs_parser___yargs_parser_16.1.0.tgz";
5632− url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz";
5633− sha1 = "73747d53ae187e7b8dbe333f95714c76ea00ecf1";
5783+ name = "yargs_parser___yargs_parser_18.1.3.tgz";
5784+ url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz";
5785+ sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0";
56345786 };
56355787 }
56365788 {
@@ -5658,11 +5810,11 @@
56585810 };
56595811 }
56605812 {
5661− name = "yargs___yargs_15.1.0.tgz";
5813+ name = "yargs___yargs_15.3.1.tgz";
56625814 path = fetchurl {
5663− name = "yargs___yargs_15.1.0.tgz";
5664− url = "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz";
5665− sha1 = "e111381f5830e863a89550bd4b136bb6a5f37219";
5815+ name = "yargs___yargs_15.3.1.tgz";
5816+ url = "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz";
5817+ sha1 = "9505b472763963e54afe60148ad27a330818e98b";
56665818 };
56675819 }
56685820 {
@@ -5674,11 +5826,11 @@
56745826 };
56755827 }
56765828 {
5677− name = "zip_stream___zip_stream_2.1.2.tgz";
5829+ name = "zip_stream___zip_stream_3.0.1.tgz";
56785830 path = fetchurl {
5679− name = "zip_stream___zip_stream_2.1.2.tgz";
5680− url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.1.2.tgz";
5681− sha1 = "841efd23214b602ff49c497cba1a85d8b5fbc39c";
5831+ name = "zip_stream___zip_stream_3.0.1.tgz";
5832+ url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-3.0.1.tgz";
5833+ sha1 = "cb8db9d324a76c09f9b76b31a12a48638b0b9708";
56825834 };
56835835 }
56845836 ];
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix → pkgs/applications/networking/instant-messengers/element/element-desktop.nixrenamed+26−29
@@ -1,44 +1,44 @@
11{ stdenv, fetchFromGitHub
22, makeWrapper, makeDesktopItem, mkYarnPackage
3−, electron_7, riot-web
3+, electron_9, element-web
44}:
55# Notes for maintainers:
6−# * versions of `riot-web` and `riot-desktop` should be kept in sync.
7−# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>`
6+# * versions of `element-web` and `element-desktop` should be kept in sync.
7+# * the Yarn dependency expression must be updated with `./update-element-desktop.sh <git release tag>`
88
99let
10− executableName = "riot-desktop";
11− version = "1.6.7";
10+ executableName = "element-desktop";
11+ version = "1.7.0";
1212 src = fetchFromGitHub {
1313 owner = "vector-im";
1414 repo = "riot-desktop";
1515 rev = "v${version}";
16− sha256 = "0l1ih7rkb0nnc79607kkg0k69j9kwqrczhgkqzsmvqxjz7pk9kgn";
16+ sha256 = "10qisz2s5w2ykh3j4bldadjzb4j963z5n0jd64dxmz9l2k9id2mk";
1717 };
18− electron = electron_7;
18+ electron = electron_9;
1919
2020in mkYarnPackage rec {
21− name = "riot-desktop-${version}";
21+ name = "element-desktop-${version}";
2222 inherit version src;
2323
24− packageJSON = ./riot-desktop-package.json;
25− yarnNix = ./riot-desktop-yarndeps.nix;
24+ packageJSON = ./element-desktop-package.json;
25+ yarnNix = ./element-desktop-yarndeps.nix;
2626
2727 nativeBuildInputs = [ makeWrapper ];
2828
2929 installPhase = ''
3030 # resources
31− mkdir -p "$out/share/riot"
32− ln -s '${riot-web}' "$out/share/riot/webapp"
33− cp -r './deps/riot-desktop' "$out/share/riot/electron"
34− cp -r './deps/riot-desktop/res/img' "$out/share/riot"
35− rm "$out/share/riot/electron/node_modules"
36− cp -r './node_modules' "$out/share/riot/electron"
31+ mkdir -p "$out/share/element"
32+ ln -s '${element-web}' "$out/share/element/webapp"
33+ cp -r './deps/element-desktop' "$out/share/element/electron"
34+ cp -r './deps/element-desktop/res/img' "$out/share/element"
35+ rm "$out/share/element/electron/node_modules"
36+ cp -r './node_modules' "$out/share/element/electron"
3737
3838 # icons
39− for icon in $out/share/riot/electron/build/icons/*.png; do
39+ for icon in $out/share/element/electron/build/icons/*.png; do
4040 mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
41− ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/riot.png"
41+ ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/element.png"
4242 done
4343
4444 # desktop item
@@ -47,36 +47,33 @@ in mkYarnPackage rec {
4747
4848 # executable wrapper
4949 makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
50− --add-flags "$out/share/riot/electron"
50+ --add-flags "$out/share/element/electron"
5151 '';
5252
53− # Do not attempt generating a tarball for riot-web again.
53+ # Do not attempt generating a tarball for element-web again.
5454 # note: `doDist = false;` does not work.
5555 distPhase = ''
5656 true
5757 '';
5858
5959 # The desktop item properties should be kept in sync with data from upstream:
60− # * productName and description from
61− # https://github.com/vector-im/riot-web/blob/develop/electron_app/package.json
62− # * category and StartupWMClass from the build.linux section of
63− # https://github.com/vector-im/riot-web/blob/develop/package.json
60+ # https://github.com/vector-im/riot-desktop/blob/develop/package.json
6461 desktopItem = makeDesktopItem {
65− name = "riot";
62+ name = "element-desktop";
6663 exec = executableName;
67− icon = "riot";
68− desktopName = "Riot";
64+ icon = "element";
65+ desktopName = "Element (Riot)";
6966 genericName = "Matrix Client";
7067 comment = meta.description;
7168 categories = "Network;InstantMessaging;Chat;";
7269 extraEntries = ''
73− StartupWMClass=riot
70+ StartupWMClass=element
7471 '';
7572 };
7673
7774 meta = with stdenv.lib; {
7875 description = "A feature-rich client for Matrix.org";
79− homepage = "https://about.riot.im/";
76+ homepage = "https://element.io/";
8077 license = licenses.asl20;
8178 maintainers = teams.matrix.members;
8279 inherit (electron.meta) platforms;
pkgs/applications/networking/instant-messengers/riot/riot-web.nix → pkgs/applications/networking/instant-messengers/element/element-web.nixrenamed+6−6
@@ -1,22 +1,22 @@
11{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
22
33# Note for maintainers:
4−# Versions of `riot-web` and `riot-desktop` should be kept in sync.
4+# Versions of `element-web` and `element-desktop` should be kept in sync.
55
66let
77 noPhoningHome = {
88 disable_guests = true; # disable automatic guest account registration at matrix.org
99 piwik = false; # disable analytics
1010 };
11− configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
11+ configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
1212
1313in stdenv.mkDerivation rec {
14− pname = "riot-web";
15− version = "1.6.8";
14+ pname = "element-web";
15+ version = "1.7.0";
1616
1717 src = fetchurl {
1818 url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
19− sha256 = "09jazixxaq9fcw3qld73hpknw7pcjg3b94hhgipl3zyn6dvqk3xv";
19+ sha256 = "033793zx3c95z5ikq70kxajwlbg2b8785wrgjr1zyha3pjq79bm6";
2020 };
2121
2222 installPhase = ''
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
3131
3232 meta = {
3333 description = "A glossy Matrix collaboration client for the web";
34− homepage = "http://riot.im/";
34+ homepage = "https://element.io/";
3535 maintainers = stdenv.lib.teams.matrix.members;
3636 license = stdenv.lib.licenses.asl20;
3737 platforms = stdenv.lib.platforms.all;
pkgs/applications/networking/instant-messengers/element/update-element-desktop.shnew file+17
@@ -0,0 +1,17 @@
1+#!/usr/bin/env nix-shell
2+#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix
3+
4+set -euo pipefail
5+
6+if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
7+ echo "Regenerates the Yarn dependency lock files for the element-desktop package."
8+ echo "Usage: $0 <git release tag>"
9+ exit 1
10+fi
11+
12+RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1"
13+
14+wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json
15+wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock
16+yarn2nix --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix
17+rm element-desktop-yarndeps.lock
pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.shdeleted−17
@@ -1,17 +0,0 @@
1−#!/usr/bin/env nix-shell
2−#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix
3−
4−set -euo pipefail
5−
6−if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
7− echo "Regenerates the Yarn dependency lock files for the riot-desktop package."
8− echo "Usage: $0 <git release tag>"
9− exit 1
10−fi
11−
12−RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1"
13−
14−wget "$RIOT_WEB_SRC/package.json" -O riot-desktop-package.json
15−wget "$RIOT_WEB_SRC/yarn.lock" -O riot-desktop-yarndeps.lock
16−yarn2nix --lockfile=riot-desktop-yarndeps.lock > riot-desktop-yarndeps.nix
17−rm riot-desktop-yarndeps.lock
pkgs/top-level/aliases.nix+2
@@ -448,6 +448,8 @@ mapAliases ({
448448 rdiff_backup = rdiff-backup; # added 2014-11-23
449449 rdmd = dtools; # added 2017-08-19
450450 rhc = throw "deprecated in 2019-04-09: abandoned by upstream.";
451+ riot-desktop = element-desktop; # added 2020-07-15
452+ riot-web = element-web; # added 2020-07-15
451453 rng_tools = rng-tools; # added 2018-10-24
452454 robomongo = robo3t; #added 2017-09-28
453455 rssglx = rss-glx; #added 2015-03-25
pkgs/top-level/all-packages.nix+6−6
@@ -1791,6 +1791,12 @@ in
17911791
17921792 eksctl = callPackage ../tools/admin/eksctl { };
17931793
1794+ element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { };
1795+
1796+ element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix {
1797+ conf = config.element-web.conf or {};
1798+ };
1799+
17941800 elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
17951801
17961802 ell = callPackage ../os-specific/linux/ell { };
@@ -2265,12 +2271,6 @@ in
22652271
22662272 ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
22672273
2268− riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { };
2269−
2270− riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
2271− conf = config.riot-web.conf or {};
2272− };
2273−
22742274 ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {
22752275 inherit (darwin.apple_sdk.frameworks) AppKit Security;
22762276 };