From 6122eb04910dd6c34585dcbff72679a93b5aeaf5 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Fri, 14 May 2021 21:21:33 +0200
Subject: update roundup, manage sources via niv

This updates all packages, as far as possible. The tcm derivations
appear to be all broken for now, as are the maps packages of both xce
versions (which should not be a problem in deployments which don't use
them, as these should not be evaluated at all).
---
 wapkgs.nix | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'wapkgs.nix')

diff --git a/wapkgs.nix b/wapkgs.nix
index a863a1c..57978cc 100644
--- a/wapkgs.nix
+++ b/wapkgs.nix
@@ -7,26 +7,7 @@ let
     buildPhase = "mkdir -p $out";
     installPhase = "cp -r * $out";
   };
-  sources = {
-    tcm = pkgs.fetchFromGitHub {
-      owner = "thecodingmachine";
-      repo = "workadventure";
-      rev = "fb6a529e4ace614c04a41ae794d6087f0ad93d6b";
-      sha256 = "10icfzffc7abl6k9lry2nidv75l3lx2f3djpw5mak9ayi05fl5xq";
-    };
-    xce = pkgs.fetchFromGitHub {
-      owner = "workadventure-xce";
-      repo = "workadventure-xce";
-      rev = "54b3b611554b256abca77fc515a47cfbe4b02df6";
-      sha256 = "0ia7054z9jmga7vyh2rzpxl7ssabrzhm9v06d7bhar1vqfbpcx9q";
-    };
-    xce-unfederated = pkgs.fetchFromGitHub {
-      owner = "workadventure-xce";
-      repo = "workadventure-xce";
-      rev = "f0c26041f814a6c78679f1cdf555c0c4af87d8a3";
-      sha256 = "13b4sd49yp9pyqpmlsh7w2sbns0nc9k13l5z94kbj8bcaslnwjx4";
-    };
-  };
+  sources = import ./nix/sources.nix {};
   wapkgs =
     pkgs.lib.fix (self: let
       mkWorkadventureSet = waSelf: workadventuresrc: name:
@@ -42,15 +23,15 @@ let
             messages = callWaPackage ./messages {};
             front = callWaPackage ./front {};
             uploader = callWaPackage ./uploader {};
-            maps = callWaPackage ./maps {};
+            maps = (callWaPackage ./maps {}).overrideAttrs (old: { meta.broken = true; });
           };
     in pkgs // rec {
       tcm = mkWorkadventureSet tcm sources.tcm "tcm";
       xce = mkWorkadventureSet xce sources.xce "xce";
-      xce-unfederated = mkWorkadventureSet xce-unfederated (patchSources sources.xce-unfederated [./xce-unfederated.patch]) "xce-unfederated";
+      xce-unfederated = mkWorkadventureSet xce-unfederated sources.xce-unfederated "xce-unfederated";
     });
 in {
-  workadventure-tcm = wapkgs.tcm;
+  workadventure-tcm = pkgs.lib.mapAttrs (n: v: v.overrideAttrs (old: { meta.broken = true; })) wapkgs.tcm;
   workadventure-xce = wapkgs.xce;
   workadventure-xce-unfederated = wapkgs.xce-unfederated;
 }
-- 
cgit v1.2.3