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.
---
 wapkgs.nix | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'wapkgs.nix')

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