reed/project-templates
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix the error about options not set when disabling the devShell or package options for templates

Browse Source
This commit is contained in:
Reed Krantz
2026-04-28 18:31:06 -05:00
parent bc9f888bcf
commit b4f51b4209
2 changed files with 56 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cad/default.nix
+39 -33
View File
@@ -102,16 +102,19 @@
# Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow'
devShells.${cfg.devShell.name} = lib.mkIf cfg.devShell.enable (pkgs.mkShell {
packages = [
pyEnv
];
devShells = lib.mkIf cfg.devShell.enable {
${cfg.devShell.name} =
pkgs.mkShell {
packages = [
pyEnv
];
shellHook = ''
export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
'';
}
// cfg.devShell.extraAttrs);
shellHook = ''
export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
'';
}
// cfg.devShell.extraAttrs;
};
# Formatter for nix files, available through 'nix fmt'
treefmt = {
@@ -120,32 +123,35 @@
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages.${cfg.package.name} = lib.mkIf cfg.package.enable (pkgs.runCommand cfg.outputName {}
/*
bash
*/
''
mkdir $out
cd $out
packages = lib.mkIf cfg.package.enable {
${cfg.package.name} =
pkgs.runCommand cfg.outputName {}
/*
bash
*/
''
mkdir $out
cd $out
${pyEnv}/bin/python ${cfg.builder}
${pyEnv}/bin/python ${cfg.builder}
${
if cfg.outputName != ""
then
/*
bash
*/
''
for ext in ${lib.concatStringsSep " " outputExt}; do
if [[ -f output.$ext ]]; then
mv output.$ext ${cfg.outputName}.$ext
fi
done
''
else ""
}
'');
${
if cfg.outputName != ""
then
/*
bash
*/
''
for ext in ${lib.concatStringsSep " " outputExt}; do
if [[ -f output.$ext ]]; then
mv output.$ext ${cfg.outputName}.$ext
fi
done
''
else ""
}
'';
};
};
});
};
rust/default.nix
+17 -11
View File
@@ -135,15 +135,18 @@
# Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow'
devShells.${cfg.devShell.name} = lib.mkIf cfg.devShell.enable (craneLib.devShell {
inherit (self') checks;
devShells = lib.mkIf cfg.devShell.enable {
${cfg.devShell.name} =
craneLib.devShell {
inherit (self') checks;
# extra tooling dependencies
packages = cfg.devDeps;
# extra tooling dependencies
packages = cfg.devDeps;
inputsFrom = [self'.packages.${cfg.package.name}];
}
// cfg.devShell.extraAttrs);
inputsFrom = [self'.packages.${cfg.package.name}];
}
// cfg.devShell.extraAttrs;
};
# Formatter for nix files, available through 'nix fmt'
treefmt = {
@@ -156,10 +159,13 @@
# Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc
packages.${cfg.package.name} = lib.mkIf cfg.package.enable (craneLib.buildPackage {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
}
// cfg.package.extraAttrs);
packages = lib.mkIf cfg.package.enable {
${cfg.package.name} =
craneLib.buildPackage {
inherit src buildInputs nativeBuildInputs cargoArtifacts;
}
// cfg.package.extraAttrs;
};
checks = {
clippy = craneLib.cargoClippy {