From b666f59ffdb1e63f90650aafb2143b0062234731 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 22 Mar 2021 20:07:11 +0100 Subject: small cleanup: shorter attribute names, move patchfiles into root, etc. --- front/tcm.patch | 0 front/xce.patch | 53 ----------------------------------------------------- tcm.patch | 0 wapkgs.nix | 14 +++++++------- xce.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 front/tcm.patch delete mode 100644 front/xce.patch create mode 100644 tcm.patch create mode 100644 xce.patch diff --git a/front/tcm.patch b/front/tcm.patch deleted file mode 100644 index e69de29..0000000 diff --git a/front/xce.patch b/front/xce.patch deleted file mode 100644 index 38772d7..0000000 --- a/front/xce.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/front/yarn.lock b/front/yarn.lock -index ed480d3..fbd8f1e 100644 ---- a/front/yarn.lock -+++ b/front/yarn.lock -@@ -1819,6 +1819,11 @@ eventemitter3@^2.0.3: - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba" - integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo= - -+eventemitter3@^3.1.2: -+ version "3.1.2" -+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" -+ integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== -+ - eventemitter3@^4.0.0, eventemitter3@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" -@@ -3762,21 +3767,10 @@ pbkdf2@^3.0.3: - safe-buffer "^5.0.1" - sha.js "^2.4.8" - --phaser@^3.52.0: -- version "3.52.0" -- resolved "https://registry.yarnpkg.com/phaser/-/phaser-3.52.0.tgz#834dd7a7717308c2576d2450d0806317cf3d1ea8" -- integrity sha512-oH39AUXR+cletB3GIvLnVO2J7/M6xs0D0LamVdCrbCDO3jckQOVBcqR6SJ2wam+4D5iJTCXv8K+FmxFzcTUWuA== -- - phaser-animated-tiles@Informatic/phaser-animated-tiles#2d5c66a9bc426dd4cb2d856c1d599494a74f8067: - version "2.0.2" - resolved "https://codeload.github.com/Informatic/phaser-animated-tiles/tar.gz/2d5c66a9bc426dd4cb2d856c1d599494a74f8067" - -- dependencies: -- eventemitter3 "^4.0.7" -- exports-loader "^1.1.1" -- imports-loader "^1.2.0" -- path "^0.12.7" -- - phaser3-rex-plugins@^1.1.32: - version "1.1.39" - resolved "https://registry.yarnpkg.com/phaser3-rex-plugins/-/phaser3-rex-plugins-1.1.39.tgz#770bfde0198874a369afd91881ddea80bf2c8479" -@@ -3787,6 +3781,14 @@ phaser3-rex-plugins@^1.1.32: - papaparse "^5.3.0" - webfontloader "^1.6.28" - -+phaser@^3.53.1: -+ version "3.53.1" -+ resolved "https://registry.yarnpkg.com/phaser/-/phaser-3.53.1.tgz#1ba603ce5e4e6d5028cdd411a5a5c0ef0f75fc86" -+ integrity sha512-yvzKotQLhdsaEfS7EdQodosUV9pvcNPcqgjh7mPzVPPZXeaUfwWu4spwgGxU4ohTckVMd2JXbOrTymXF5Qs1Dg== -+ dependencies: -+ eventemitter3 "^4.0.7" -+ path "^0.12.7" -+ - picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" diff --git a/tcm.patch b/tcm.patch new file mode 100644 index 0000000..e69de29 diff --git a/wapkgs.nix b/wapkgs.nix index 6f7a0c1..cf6fef8 100644 --- a/wapkgs.nix +++ b/wapkgs.nix @@ -27,7 +27,7 @@ let }; wapkgs = pkgs.lib.fix (self: let - mkWorkadventureset = waSelf: workadventuresrc: name: + mkWorkadventureSet = waSelf: workadventuresrc: name: let callWaPackage = path: pkgs.lib.callPackageWith # some parts of workadventure depend on other parts of workadventure @@ -43,12 +43,12 @@ let maps = callWaPackage ./maps {}; }; in pkgs // rec { - workadventure-tcm = mkWorkadventureset workadventure-tcm (patchSources tcm [ ./front/tcm.patch ]) "tcm"; - workadventure-fediventure = mkWorkadventureset workadventure-fediventure fediventure "fediventure"; - workadventure-xce = mkWorkadventureset workadventure-xce (patchSources xce [ ./front/xce.patch ]) "xce"; + tcm = mkWorkadventureSet tcm (patchSources tcm [ ./tcm.patch ]) "tcm"; + fediventure = mkWorkadventureSet fediventure fediventure "fediventure"; + xce = mkWorkadventureSet xce (patchSources xce [ ./xce.patch ]) "xce"; }); in { - workadventure-tcm = wapkgs.workadventure-tcm; - workadventure-fediventure = wapkgs.workadventure-fediventure; - workadventure-xce = wapkgs.workadventure-xce; + workadventure-tcm = wapkgs.tcm; + workadventure-fediventure = wapkgs.fediventure; + workadventure-xce = wapkgs.xce; } diff --git a/xce.patch b/xce.patch new file mode 100644 index 0000000..38772d7 --- /dev/null +++ b/xce.patch @@ -0,0 +1,53 @@ +diff --git a/front/yarn.lock b/front/yarn.lock +index ed480d3..fbd8f1e 100644 +--- a/front/yarn.lock ++++ b/front/yarn.lock +@@ -1819,6 +1819,11 @@ eventemitter3@^2.0.3: + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba" + integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo= + ++eventemitter3@^3.1.2: ++ version "3.1.2" ++ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" ++ integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== ++ + eventemitter3@^4.0.0, eventemitter3@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" +@@ -3762,21 +3767,10 @@ pbkdf2@^3.0.3: + safe-buffer "^5.0.1" + sha.js "^2.4.8" + +-phaser@^3.52.0: +- version "3.52.0" +- resolved "https://registry.yarnpkg.com/phaser/-/phaser-3.52.0.tgz#834dd7a7717308c2576d2450d0806317cf3d1ea8" +- integrity sha512-oH39AUXR+cletB3GIvLnVO2J7/M6xs0D0LamVdCrbCDO3jckQOVBcqR6SJ2wam+4D5iJTCXv8K+FmxFzcTUWuA== +- + phaser-animated-tiles@Informatic/phaser-animated-tiles#2d5c66a9bc426dd4cb2d856c1d599494a74f8067: + version "2.0.2" + resolved "https://codeload.github.com/Informatic/phaser-animated-tiles/tar.gz/2d5c66a9bc426dd4cb2d856c1d599494a74f8067" + +- dependencies: +- eventemitter3 "^4.0.7" +- exports-loader "^1.1.1" +- imports-loader "^1.2.0" +- path "^0.12.7" +- + phaser3-rex-plugins@^1.1.32: + version "1.1.39" + resolved "https://registry.yarnpkg.com/phaser3-rex-plugins/-/phaser3-rex-plugins-1.1.39.tgz#770bfde0198874a369afd91881ddea80bf2c8479" +@@ -3787,6 +3781,14 @@ phaser3-rex-plugins@^1.1.32: + papaparse "^5.3.0" + webfontloader "^1.6.28" + ++phaser@^3.53.1: ++ version "3.53.1" ++ resolved "https://registry.yarnpkg.com/phaser/-/phaser-3.53.1.tgz#1ba603ce5e4e6d5028cdd411a5a5c0ef0f75fc86" ++ integrity sha512-yvzKotQLhdsaEfS7EdQodosUV9pvcNPcqgjh7mPzVPPZXeaUfwWu4spwgGxU4ohTckVMd2JXbOrTymXF5Qs1Dg== ++ dependencies: ++ eventemitter3 "^4.0.7" ++ path "^0.12.7" ++ + picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" -- cgit v1.2.3