Publish quixos-nix-helpers from 398fd9e0d723c3fe7a511c2c35702874fd7342d0

.quixos-subtree-source.json

@@ -0,0 +1,8 @@
+{
+  "version": 1,
+  "sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git",
+  "sourceCommit": "398fd9e0d723c3fe7a511c2c35702874fd7342d0",
+  "sourcePath": "quixos-instance/quixos-nix-helpers",
+  "exportName": "quixos-nix-helpers",
+  "mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
+}

quixos-package-helpers.nix

@@ -521,6 +521,7 @@ EOF
       promptName ? null,
       nodejsAttr ? "nodejs_24",
       buildCommand ? "yarn build",
+      sourcePortals ? { },
       buildEnv ? { },
       nativeBuildInputs ? [ ],
       devShellPackages ? [ ],
@@ -560,20 +561,19 @@ EOF
               attrs
           );
 
+        portalLinksFor = attrs:
+          lib.concatStringsSep "\n" (
+            lib.mapAttrsToList
+              (target: source: "ln -sfn ${source} ${lib.escapeShellArg target}")
+              attrs
+          );
+
         bundleConfig = if bundle == null then { } else bundle;
         bundleOutfile = bundleConfig.outfile or "server.mjs";
         bundlePlatform = bundleConfig.platform or "node";
         bundleTarget = bundleConfig.target or "node24";
         bundleFormat = bundleConfig.format or "esm";
         bundleBanner = bundleConfig.banner or nodeRequireBanner;
-        bundleAliases = bundleConfig.aliases or {
-          "@automerge/automerge" = "./node_modules/@automerge/automerge/dist/mjs/entrypoints/fullfat_base64.js";
-        };
-        bundleAliasArgs = lib.concatStringsSep " " (
-          lib.mapAttrsToList
-            (from: to: "--alias:${from}=${lib.escapeShellArg to}")
-            bundleAliases
-        );
         nodeRequireBanner = "import { createRequire } from 'module';const require = createRequire(import.meta.url);";
         bundleCommand =
           if bundle == null
@@ -584,7 +584,6 @@ EOF
               --platform=${bundlePlatform} \
               --target=${bundleTarget} \
               --format=${bundleFormat} \
-              ${bundleAliasArgs} \
               ${lib.optionalString (bundleConfig.preserveSymlinks or true) "--preserve-symlinks \\"}
               --banner:js=${lib.escapeShellArg bundleBanner} \
               --outfile=${lib.escapeShellArg bundleOutfile}
@@ -631,6 +630,9 @@ EOF
               (old.nativeBuildInputs or [ ])
               ++ lib.optional (bundle != null) pkgs.esbuild
               ++ callOption nativeBuildInputs;
+            preConfigure = (old.preConfigure or "") + ''
+              ${portalLinksFor (callOption sourcePortals)}
+            '';
             buildPhase = ''
               runHook preBuild
               ${exportsFor (callOption buildEnv)}
@@ -670,7 +672,7 @@ EOF
         devShells.default = pkgs.mkShell {
           packages = [
             nodejs
-            project.yarn-freestanding
+            pkgs.yarn-berry_4
           ] ++ callOption devShellPackages;
           shellHook = devShellHookBase + callOption devShellHook;
         };