Revert generated-file renaming; retain formatter exclusions

This commit is contained in:
Timothy J. Aveni
2026-09-15 20:13:10 -07:00
parent b3d31b37b3
commit 0c3c9c6ad8
+5 -5
View File
@@ -40,7 +40,7 @@ let
if match2 == null then null else builtins.elemAt match2 0; if match2 == null then null else builtins.elemAt match2 0;
schemaBase = schemaBase =
(pkgs.callPackage "${schemaDir}/yarn-project.gen.nix" { (pkgs.callPackage "${schemaDir}/yarn-project.nix" {
inherit nodejs git; inherit nodejs git;
}) })
{ {
@@ -276,7 +276,7 @@ let
packageName = packageJson.name or "quixos-package"; packageName = packageJson.name or "quixos-package";
base = base =
(pkgs.callPackage "${srcDir}/yarn-project.gen.nix" { (pkgs.callPackage "${srcDir}/yarn-project.nix" {
nodejs = nodejs'; nodejs = nodejs';
git = git'; git = git';
}) })
@@ -628,7 +628,7 @@ let
resources = bindingConfig.resources or [ ]; resources = bindingConfig.resources or [ ];
}); });
bindingOutput = bindingOutput =
if bindingConfig == null then "src/gen/qx.gen.ts" else bindingConfig.output or "src/gen/qx.gen.ts"; if bindingConfig == null then "src/gen/qx.ts" else bindingConfig.output or "src/gen/qx.ts";
authoringCheck = builtins.fromJSON (builtins.readFile "${packageRoot}/quixos.check.json"); authoringCheck = builtins.fromJSON (builtins.readFile "${packageRoot}/quixos.check.json");
bindingOptionsFile = bindingOptionsFile =
if bindingConfig == null then if bindingConfig == null then
@@ -709,7 +709,7 @@ let
serverLibexecName = serverLibexecName =
installConfig.libexecName or (lib.strings.sanitizeDerivationName packageNameFinal); installConfig.libexecName or (lib.strings.sanitizeDerivationName packageNameFinal);
serverFile = installConfig.serverFile or bundleOutfile; serverFile = installConfig.serverFile or bundleOutfile;
descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.gen.txtpb"; descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.txtpb";
extraFiles = installConfig.extraFiles or [ ]; extraFiles = installConfig.extraFiles or [ ];
installExtraFile = installExtraFile =
file: file:
@@ -752,7 +752,7 @@ let
runHook postInstall runHook postInstall
''; '';
project = (pkgs.callPackage "${packageRoot}/yarn-project.gen.nix" { inherit nodejs; }) { project = (pkgs.callPackage "${packageRoot}/yarn-project.nix" { inherit nodejs; }) {
src = packageRoot; src = packageRoot;
overrideAttrs = overrideAttrs =
old: old: