diff options
| -rw-r--r-- | back/tcm.nix | 8 | ||||
| -rw-r--r-- | default.nix | 1 | ||||
| -rw-r--r-- | front/default.nix | 2 | ||||
| -rw-r--r-- | uploader/default.nix | 1 | ||||
| -rw-r--r-- | uploader/yarn.nix | 8 | ||||
| -rw-r--r-- | wapkgs.nix | 2 |
6 files changed, 15 insertions, 7 deletions
diff --git a/back/tcm.nix b/back/tcm.nix index 69849c5..73abf51 100644 --- a/back/tcm.nix +++ b/back/tcm.nix @@ -1994,11 +1994,11 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { diff --git a/default.nix b/default.nix index d620da9..8e631bd 100644 --- a/default.nix +++ b/default.nix @@ -108,6 +108,7 @@ let JITSI_PRIVATE_MODE = if cc.jitsi.privateMode then "true" else "false"; API_URL = (urls instanceConfig).api; + PUSHER_URL = (urls instanceConfig).api; UPDLOADER_URL = (urls instanceConfig).uploader; ADMIN_URL = (urls instanceConfig).admin; MAPS_URL = (urls instanceConfig).maps; diff --git a/front/default.nix b/front/default.nix index e881459..95606e0 100644 --- a/front/default.nix +++ b/front/default.nix @@ -15,7 +15,7 @@ workadventuresrc: waname: , yarn2nix-moretea , lib , replace -, environment ? {} +, environment ? {PUSHER_URL = "https://example.org/dummy/pusher";} , ... }: let diff --git a/uploader/default.nix b/uploader/default.nix index 4593caa..30e2f4e 100644 --- a/uploader/default.nix +++ b/uploader/default.nix @@ -25,7 +25,6 @@ yarn2nix-moretea.mkYarnPackage rec { buildPhase = '' mkdir -p $out - # ln -s ${workadventure.messages.outPath}/generated deps/workadventureback/src/Messages/generated HOME=$TMPDIR yarn --offline run tsc cp -r deps/workadventureback/dist $out/dist ''; diff --git a/uploader/yarn.nix b/uploader/yarn.nix index 6b646d5..784be48 100644 --- a/uploader/yarn.nix +++ b/uploader/yarn.nix @@ -1306,6 +1306,14 @@ }; } { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { name = "lodash___lodash_4.17.20.tgz"; path = fetchurl { name = "lodash___lodash_4.17.20.tgz"; @@ -31,7 +31,7 @@ let xce-unfederated = mkWorkadventureSet xce-unfederated sources.xce-unfederated "xce-unfederated"; }); in { - workadventure-tcm = pkgs.lib.mapAttrs (n: v: v.overrideAttrs (old: { meta.broken = true; })) wapkgs.tcm; + workadventure-tcm = wapkgs.tcm; workadventure-xce = wapkgs.xce; workadventure-xce-unfederated = wapkgs.xce-unfederated; } |