From 6e1bfd440fc2dcf115a543d45e293b2c1ef6c929 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Fri, 9 Apr 2021 02:05:27 +0200
Subject: package update roundup, remove fediventure version

updates:
 - workadventure-xce to the latest commit
 - workadventure-tcm to the latest commit

this removes the fediventure-version, as it appears to be no longer
updated, and since the workadventure-xce version now also includes the
relevant patches for the current federation features.
---
 back/yarn.nix     |  8 ++---
 front/tcm.nix     |  8 ++---
 front/xce.nix     | 96 +++++++++++++++++++++++++++----------------------------
 messages/yarn.nix |  8 ++---
 pusher/yarn.nix   |  8 ++---
 wapkgs.nix        | 22 ++++---------
 6 files changed, 71 insertions(+), 79 deletions(-)

diff --git a/back/yarn.nix b/back/yarn.nix
index e3e38e2..69849c5 100644
--- a/back/yarn.nix
+++ b/back/yarn.nix
@@ -3538,11 +3538,11 @@
       };
     }
     {
-      name = "y18n___y18n_3.2.1.tgz";
+      name = "y18n___y18n_3.2.2.tgz";
       path = fetchurl {
-        name = "y18n___y18n_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        name = "y18n___y18n_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz";
+        sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696";
       };
     }
     {
diff --git a/front/tcm.nix b/front/tcm.nix
index 4ab5c54..6772190 100644
--- a/front/tcm.nix
+++ b/front/tcm.nix
@@ -5938,11 +5938,11 @@
       };
     }
     {
-      name = "y18n___y18n_4.0.0.tgz";
+      name = "y18n___y18n_4.0.1.tgz";
       path = fetchurl {
-        name = "y18n___y18n_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz";
-        sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b";
+        name = "y18n___y18n_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz";
+        sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4";
       };
     }
     {
diff --git a/front/xce.nix b/front/xce.nix
index 3252580..c841403 100644
--- a/front/xce.nix
+++ b/front/xce.nix
@@ -73,6 +73,14 @@
         sha1 = "429512e541bbd777f2c867692e6335ee08d1f6d4";
       };
     }
+    {
+      name = "_types_hls.js___hls.js_0.13.3.tgz";
+      path = fetchurl {
+        name = "_types_hls.js___hls.js_0.13.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/hls.js/-/hls.js-0.13.3.tgz";
+        sha1 = "eb982a866125745eadee468c989fc9e189f24019";
+      };
+    }
     {
       name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz";
       path = fetchurl {
@@ -778,11 +786,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";
       };
     }
     {
@@ -1722,11 +1730,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";
       };
     }
     {
@@ -2041,14 +2049,6 @@
         sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
       };
     }
-    {
-      name = "exports_loader___exports_loader_1.1.1.tgz";
-      path = fetchurl {
-        name = "exports_loader___exports_loader_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/exports-loader/-/exports-loader-1.1.1.tgz";
-        sha1 = "88c9a6877ee6a5519d7c41a016bdd99148421e69";
-      };
-    }
     {
       name = "express___express_4.17.1.tgz";
       path = fetchurl {
@@ -2609,6 +2609,14 @@
         sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
       };
     }
+    {
+      name = "hls.js___hls.js_0.14.17.tgz";
+      path = fetchurl {
+        name = "hls.js___hls.js_0.14.17.tgz";
+        url  = "https://registry.yarnpkg.com/hls.js/-/hls.js-0.14.17.tgz";
+        sha1 = "0127cff2ec2f994a54eb955fe669ef6153a8e317";
+      };
+    }
     {
       name = "hmac_drbg___hmac_drbg_1.0.1.tgz";
       path = fetchurl {
@@ -2785,14 +2793,6 @@
         sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d";
       };
     }
-    {
-      name = "imports_loader___imports_loader_1.2.0.tgz";
-      path = fetchurl {
-        name = "imports_loader___imports_loader_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz";
-        sha1 = "b06823d0bb42e6f5ff89bc893829000eda46693f";
-      };
-    }
     {
       name = "imurmurhash___imurmurhash_0.1.4.tgz";
       path = fetchurl {
@@ -4210,27 +4210,27 @@
       };
     }
     {
-      name = "2d5c66a9bc426dd4cb2d856c1d599494a74f8067";
+      name = "phaser3_rex_plugins___phaser3_rex_plugins_1.1.44.tgz";
       path = fetchurl {
-        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.44.tgz";
+        url  = "https://registry.yarnpkg.com/phaser3-rex-plugins/-/phaser3-rex-plugins-1.1.44.tgz";
+        sha1 = "83588ab2801c5b3a80a18be4f0ae37f1f32096b0";
       };
     }
     {
-      name = "phaser3_rex_plugins___phaser3_rex_plugins_1.1.39.tgz";
+      name = "phaser___phaser_3.54.0.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.54.0.tgz";
+        url  = "https://registry.yarnpkg.com/phaser/-/phaser-3.54.0.tgz";
+        sha1 = "46b191e46059aab2a9a57f78525c60b595767eee";
       };
     }
     {
-      name = "phaser___phaser_3.53.1.tgz";
+      name = "2d5c66a9bc426dd4cb2d856c1d599494a74f8067";
       path = fetchurl {
-        name = "phaser___phaser_3.53.1.tgz";
-        url  = "https://registry.yarnpkg.com/phaser/-/phaser-3.53.1.tgz";
-        sha1 = "1ba603ce5e4e6d5028cdd411a5a5c0ef0f75fc86";
+        name = "2d5c66a9bc426dd4cb2d856c1d599494a74f8067";
+        url  = "https://codeload.github.com/Informatic/phaser-animated-tiles/tar.gz/2d5c66a9bc426dd4cb2d856c1d599494a74f8067";
+        sha1 = "c724f58be8b9da7742ba4ce138f047b2c4184a7d";
       };
     }
     {
@@ -5321,14 +5321,6 @@
         sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532";
       };
     }
-    {
-      name = "strip_comments___strip_comments_2.0.1.tgz";
-      path = fetchurl {
-        name = "strip_comments___strip_comments_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz";
-        sha1 = "4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b";
-      };
-    }
     {
       name = "strip_eof___strip_eof_1.0.0.tgz";
       path = fetchurl {
@@ -5673,6 +5665,14 @@
         sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278";
       };
     }
+    {
+      name = "url_toolkit___url_toolkit_2.2.1.tgz";
+      path = fetchurl {
+        name = "url_toolkit___url_toolkit_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.1.tgz";
+        sha1 = "89009ed3d62a3574de079532a7266c14d2cc1c4f";
+      };
+    }
     {
       name = "url___url_0.11.0.tgz";
       path = fetchurl {
@@ -5986,11 +5986,11 @@
       };
     }
     {
-      name = "y18n___y18n_4.0.0.tgz";
+      name = "y18n___y18n_4.0.1.tgz";
       path = fetchurl {
-        name = "y18n___y18n_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz";
-        sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b";
+        name = "y18n___y18n_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz";
+        sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4";
       };
     }
     {
diff --git a/messages/yarn.nix b/messages/yarn.nix
index c4a1b62..388904c 100644
--- a/messages/yarn.nix
+++ b/messages/yarn.nix
@@ -4634,11 +4634,11 @@
       };
     }
     {
-      name = "y18n___y18n_3.2.1.tgz";
+      name = "y18n___y18n_3.2.2.tgz";
       path = fetchurl {
-        name = "y18n___y18n_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        name = "y18n___y18n_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz";
+        sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696";
       };
     }
     {
diff --git a/pusher/yarn.nix b/pusher/yarn.nix
index e3e38e2..69849c5 100644
--- a/pusher/yarn.nix
+++ b/pusher/yarn.nix
@@ -3538,11 +3538,11 @@
       };
     }
     {
-      name = "y18n___y18n_3.2.1.tgz";
+      name = "y18n___y18n_3.2.2.tgz";
       path = fetchurl {
-        name = "y18n___y18n_3.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        name = "y18n___y18n_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz";
+        sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696";
       };
     }
     {
diff --git a/wapkgs.nix b/wapkgs.nix
index 1fef2b0..2b53dca 100644
--- a/wapkgs.nix
+++ b/wapkgs.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}:
+{pkgs ? import <nixpkgs> {}, ...}:
 
 let
   patchSources = src: patches: pkgs.stdenv.mkDerivation {
@@ -11,20 +11,14 @@ let
     tcm = pkgs.fetchFromGitHub {
       owner = "thecodingmachine";
       repo = "workadventure";
-      rev = "4966789b3b3abe8d00362553a827bc9a257ce6d3";
-      sha256 = "0nq6zg95wsq2ldqhi7w7alvb9krmzrqkgzq0m24cfvpm42agl1xc";
-    };
-    fediventure = pkgs.fetchFromGitLab {
-      owner = "fediventure";
-      repo = "workadventure";
-      rev = "e769e713c6058efac6959437df6a02da02b8e065";
-      sha256 = "13243az0b2w69wmbf5z0qnbd9rfixkj61c844c97sy2h136159yd";
+      rev = "fb6a529e4ace614c04a41ae794d6087f0ad93d6b";
+      sha256 = "10icfzffc7abl6k9lry2nidv75l3lx2f3djpw5mak9ayi05fl5xq";
     };
     xce = pkgs.fetchFromGitHub {
       owner = "workadventure-xce";
       repo = "workadventure-xce";
-      rev = "ba439ca6699a7e5751386d5bed5c44e375e12eb6";
-      sha256 = "1r6dpn8biisrqij5v2pg1vlifgvv93fnqppyp2l9wzls5am3rx6x";
+      rev = "54b3b611554b256abca77fc515a47cfbe4b02df6";
+      sha256 = "0ia7054z9jmga7vyh2rzpxl7ssabrzhm9v06d7bhar1vqfbpcx9q";
     };
   };
   wapkgs =
@@ -45,12 +39,10 @@ let
             maps = callWaPackage ./maps {};
           };
     in pkgs // rec {
-      tcm = mkWorkadventureSet tcm (patchSources sources.tcm [ ./tcm.patch ]) "tcm";
-      fediventure = mkWorkadventureSet fediventure sources.fediventure "fediventure";
-      xce = mkWorkadventureSet xce (patchSources sources.xce [ ./xce.patch ]) "xce";
+      tcm = mkWorkadventureSet tcm (patchSources sources.tcm [  ]) "tcm";
+      xce = mkWorkadventureSet xce sources.xce "xce";
     });
 in {
   workadventure-tcm = wapkgs.tcm;
-  workadventure-fediventure = wapkgs.fediventure;
   workadventure-xce = wapkgs.xce;
 }
-- 
cgit v1.2.3