From 1666f59a480ac355fa327ad208de3de9f51752ca Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 1 Mar 2021 23:05:18 +0100 Subject: version from github repo tabascoeye/workadventure This version apparently has less issues with the graphics display, i.e. it uses a slightly newer version of Phaser. I put it in a seperate branch for now; in the long term, it may be better to just provide several "flavours" of workadventure in the main branch. --- front/yarn.nix | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- wapkgs.nix | 6 +++--- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/front/yarn.nix b/front/yarn.nix index efaf5fb..b0fba7c 100644 --- a/front/yarn.nix +++ b/front/yarn.nix @@ -1937,6 +1937,14 @@ sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; } + { + name = "eventemitter3___eventemitter3_3.1.2.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz"; + sha1 = "2d3d48f9c346698fce83a85d7d664e98535df6e7"; + }; + } { name = "eventemitter3___eventemitter3_4.0.7.tgz"; path = fetchurl { @@ -3321,6 +3329,14 @@ sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; }; } + { + name = "lokijs___lokijs_1.5.11.tgz"; + path = fetchurl { + name = "lokijs___lokijs_1.5.11.tgz"; + url = "https://registry.yarnpkg.com/lokijs/-/lokijs-1.5.11.tgz"; + sha1 = "2b2ea82ec66050e4b112c6cfc588dac22d362b13"; + }; + } { name = "lower_case___lower_case_2.0.1.tgz"; path = fetchurl { @@ -3929,6 +3945,14 @@ sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; }; } + { + name = "papaparse___papaparse_5.3.0.tgz"; + path = fetchurl { + name = "papaparse___papaparse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.0.tgz"; + sha1 = "ab1702feb96e79ab4309652f36db9536563ad05a"; + }; + } { name = "parallel_transform___parallel_transform_1.2.0.tgz"; path = fetchurl { @@ -4090,11 +4114,27 @@ }; } { - name = "phaser___phaser_3.24.1.tgz"; + name = "2d5c66a9bc426dd4cb2d856c1d599494a74f8067"; path = fetchurl { - name = "phaser___phaser_3.24.1.tgz"; - url = "https://registry.yarnpkg.com/phaser/-/phaser-3.24.1.tgz"; - sha1 = "376e0c965d2a35af37c06ee78627dafbde5be017"; + name = "2d5c66a9bc426dd4cb2d856c1d599494a74f8067"; + url = "https://codeload.github.com/Informatic/phaser-animated-tiles/tar.gz/2d5c66a9bc426dd4cb2d856c1d599494a74f8067"; + sha1 = "c724f58be8b9da7742ba4ce138f047b2c4184a7d"; + }; + } + { + name = "phaser3_rex_plugins___phaser3_rex_plugins_1.1.39.tgz"; + path = fetchurl { + name = "phaser3_rex_plugins___phaser3_rex_plugins_1.1.39.tgz"; + url = "https://registry.yarnpkg.com/phaser3-rex-plugins/-/phaser3-rex-plugins-1.1.39.tgz"; + sha1 = "770bfde0198874a369afd91881ddea80bf2c8479"; + }; + } + { + name = "phaser___phaser_3.52.0.tgz"; + path = fetchurl { + name = "phaser___phaser_3.52.0.tgz"; + url = "https://registry.yarnpkg.com/phaser/-/phaser-3.52.0.tgz"; + sha1 = "834dd7a7717308c2576d2450d0806317cf3d1ea8"; }; } { @@ -5569,6 +5609,14 @@ sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; }; } + { + name = "webfontloader___webfontloader_1.6.28.tgz"; + path = fetchurl { + name = "webfontloader___webfontloader_1.6.28.tgz"; + url = "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz"; + sha1 = "db786129253cb6e8eae54c2fb05f870af6675bae"; + }; + } { name = "webpack_cli___webpack_cli_3.3.12.tgz"; path = fetchurl { diff --git a/wapkgs.nix b/wapkgs.nix index 5e84fb3..1131b98 100644 --- a/wapkgs.nix +++ b/wapkgs.nix @@ -2,10 +2,10 @@ let workadventuresrc = pkgs.fetchFromGitHub { - owner = "thecodingmachine"; + owner = "tabascoeye"; repo = "workadventure"; - rev = "6e9c71598004dc9cbab9418efb3c0ac892da7ca2"; - sha256 = "0rvra0dy631al4aylacyqldkyd6biawz2shsikgcy30nv5lzc78c"; + rev = "1824ce3ad469693c0d7bd0dbbd0fc84246889fdd"; + sha256 = "1h5wx5v09hlx680pq1rpzadzc2cylmyx0szxmpsjvilnnv7vplhd"; }; in lib.fix (self: let -- cgit v1.2.3