diff --git a/.quixos-subtree-source.json b/.quixos-subtree-source.json index 02b5cfe..7334fb5 100644 --- a/.quixos-subtree-source.json +++ b/.quixos-subtree-source.json @@ -1,7 +1,7 @@ { "version": 1, "sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git", - "sourceCommit": "8354a2e04f56eea0a647e878ca19c5398c1e1f89", + "sourceCommit": "b5db4f65b59842ba912cb89d11237d0ce428ea95", "sourcePath": "quixos-instance/quixos-nix-helpers", "exportName": "quixos-nix-helpers", "mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git" diff --git a/quixos-package-helpers.nix b/quixos-package-helpers.nix index 23f52da..44e9c5b 100644 --- a/quixos-package-helpers.nix +++ b/quixos-package-helpers.nix @@ -521,7 +521,6 @@ EOF promptName ? null, nodejsAttr ? "nodejs_24", buildCommand ? "yarn build", - sourcePortals ? { }, buildEnv ? { }, nativeBuildInputs ? [ ], devShellPackages ? [ ], @@ -561,13 +560,6 @@ 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"; @@ -639,9 +631,6 @@ 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)} @@ -681,7 +670,7 @@ EOF devShells.default = pkgs.mkShell { packages = [ nodejs - pkgs.yarn-berry_4 + project.yarn-freestanding ] ++ callOption devShellPackages; shellHook = devShellHookBase + callOption devShellHook; };