From ad7262c2cf771f89ad4a29e02c628be3a9eb9597 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 22 Mar 2021 20:05:35 +0100 Subject: update thecodingmachine workadventure version --- front/tcm.nix | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- front/tcm.patch | 0 wapkgs.nix | 8 +-- 3 files changed, 212 insertions(+), 12 deletions(-) create mode 100644 front/tcm.patch diff --git a/front/tcm.nix b/front/tcm.nix index efaf5fb..4ab5c54 100644 --- a/front/tcm.nix +++ b/front/tcm.nix @@ -778,11 +778,11 @@ }; } { - name = "bn.js___bn.js_4.11.9.tgz"; + name = "bn.js___bn.js_4.12.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.9.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; - sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; }; } { @@ -1001,6 +1001,14 @@ sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; }; } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } { name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { @@ -1033,6 +1041,14 @@ sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; } + { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } { name = "chokidar___chokidar_2.1.8.tgz"; path = fetchurl { @@ -1161,6 +1177,14 @@ sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; }; } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } { name = "commander___commander_2.20.3.tgz"; path = fetchurl { @@ -1369,6 +1393,14 @@ sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; }; } + { + name = "css_loader___css_loader_5.1.3.tgz"; + path = fetchurl { + name = "css_loader___css_loader_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.1.3.tgz"; + sha1 = "87f6fc96816b20debe3cf682f85c7e56a963d0d1"; + }; + } { name = "css_select___css_select_1.2.0.tgz"; path = fetchurl { @@ -1385,6 +1417,14 @@ sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; }; } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } { name = "cyclist___cyclist_1.0.1.tgz"; path = fetchurl { @@ -1682,11 +1722,11 @@ }; } { - name = "elliptic___elliptic_6.5.3.tgz"; + name = "elliptic___elliptic_6.5.4.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; - sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; }; } { @@ -2289,6 +2329,14 @@ sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; }; } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { @@ -2681,6 +2729,14 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } + { + name = "icss_utils___icss_utils_5.1.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; + sha1 = "c6be6858abd013d768e98366ae47e25d5887b1ae"; + }; + } { name = "ieee754___ieee754_1.1.13.tgz"; path = fetchurl { @@ -2737,6 +2793,14 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } + { + name = "indexes_of___indexes_of_1.0.1.tgz"; + path = fetchurl { + name = "indexes_of___indexes_of_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + } { name = "indexof___indexof_0.0.1.tgz"; path = fetchurl { @@ -3257,6 +3321,14 @@ sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } { name = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -3337,6 +3409,14 @@ sha1 = "1da27e6710271947695daf6848e847f01d84b920"; }; } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } { name = "make_dir___make_dir_2.1.0.tgz"; path = fetchurl { @@ -3505,6 +3585,14 @@ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; }; } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.9.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.3.9.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.9.tgz"; + sha1 = "47a32132b0fd97a119acd530e8421e8f6ab16d5e"; + }; + } { name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; path = fetchurl { @@ -3625,6 +3713,14 @@ sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; }; } + { + name = "nanoid___nanoid_3.1.22.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.22.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; + sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + }; + } { name = "nanomatch___nanomatch_1.2.13.tgz"; path = fetchurl { @@ -4161,6 +4257,62 @@ sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + }; + } + { + name = "postcss___postcss_8.2.8.tgz"; + path = fetchurl { + name = "postcss___postcss_8.2.8.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.8.tgz"; + sha1 = "0b90f9382efda424c4f0f69a2ead6f6830d08ece"; + }; + } { name = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { @@ -4409,6 +4561,14 @@ sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; }; } + { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } { name = "regex_not___regex_not_1.0.2.tgz"; path = fetchurl { @@ -4649,6 +4809,22 @@ sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; }; } + { + name = "sass_loader___sass_loader_10.1.1.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz"; + sha1 = "4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"; + }; + } + { + name = "sass___sass_1.32.8.tgz"; + path = fetchurl { + name = "sass___sass_1.32.8.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz"; + sha1 = "f16a9abd8dc530add8834e506878a2808c037bdc"; + }; + } { name = "schema_utils___schema_utils_1.0.0.tgz"; path = fetchurl { @@ -4705,6 +4881,14 @@ sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; }; } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } { name = "send___send_0.17.1.tgz"; path = fetchurl { @@ -5377,6 +5561,14 @@ sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; }; } + { + name = "uniq___uniq_1.0.1.tgz"; + path = fetchurl { + name = "uniq___uniq_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + } { name = "unique_filename___unique_filename_1.1.1.tgz"; path = fetchurl { @@ -5761,6 +5953,14 @@ sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; }; } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } { name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { diff --git a/front/tcm.patch b/front/tcm.patch new file mode 100644 index 0000000..e69de29 diff --git a/wapkgs.nix b/wapkgs.nix index 18f88c7..6f7a0c1 100644 --- a/wapkgs.nix +++ b/wapkgs.nix @@ -7,11 +7,11 @@ let buildPhase = "mkdir -p $out"; installPhase = "cp -r * $out"; }; - codingmachine = pkgs.fetchFromGitHub { + tcm = pkgs.fetchFromGitHub { owner = "thecodingmachine"; repo = "workadventure"; - rev = "6e9c71598004dc9cbab9418efb3c0ac892da7ca2"; - sha256 = "0rvra0dy631al4aylacyqldkyd6biawz2shsikgcy30nv5lzc78c"; + rev = "4966789b3b3abe8d00362553a827bc9a257ce6d3"; + sha256 = "0nq6zg95wsq2ldqhi7w7alvb9krmzrqkgzq0m24cfvpm42agl1xc"; }; fediventure = pkgs.fetchFromGitLab { owner = "fediventure"; @@ -43,7 +43,7 @@ let maps = callWaPackage ./maps {}; }; in pkgs // rec { - workadventure-tcm = mkWorkadventureset workadventure-tcm codingmachine "tcm"; + workadventure-tcm = mkWorkadventureset workadventure-tcm (patchSources tcm [ ./front/tcm.patch ]) "tcm"; workadventure-fediventure = mkWorkadventureset workadventure-fediventure fediventure "fediventure"; workadventure-xce = mkWorkadventureset workadventure-xce (patchSources xce [ ./front/xce.patch ]) "xce"; }); -- cgit v1.2.3