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
+10 -4
View File
@@ -102,7 +102,9 @@
# Dev Shell that lets you enter an environment with all the necessary utilites # Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop' # Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow' # 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 { devShells = lib.mkIf cfg.devShell.enable {
${cfg.devShell.name} =
pkgs.mkShell {
packages = [ packages = [
pyEnv pyEnv
]; ];
@@ -111,7 +113,8 @@
export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH" export PYTHONPATH="${pyEnv}/${pyEnv.sitePackages}:$PYTHONPATH"
''; '';
} }
// cfg.devShell.extraAttrs); // cfg.devShell.extraAttrs;
};
# Formatter for nix files, available through 'nix fmt' # Formatter for nix files, available through 'nix fmt'
treefmt = { treefmt = {
@@ -120,7 +123,9 @@
# Your custom packages # Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc # Accessible through 'nix build', 'nix shell', 'nix run', etc
packages.${cfg.package.name} = lib.mkIf cfg.package.enable (pkgs.runCommand cfg.outputName {} packages = lib.mkIf cfg.package.enable {
${cfg.package.name} =
pkgs.runCommand cfg.outputName {}
/* /*
bash bash
*/ */
@@ -145,7 +150,8 @@
'' ''
else "" else ""
} }
''); '';
};
}; };
}); });
}; };
rust/default.nix
+10 -4
View File
@@ -135,7 +135,9 @@
# Dev Shell that lets you enter an environment with all the necessary utilites # Dev Shell that lets you enter an environment with all the necessary utilites
# Available through 'nix develop' # Available through 'nix develop'
# Also can be activated automatically if direnv is installed on the system with 'direnv allow' # 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 { devShells = lib.mkIf cfg.devShell.enable {
${cfg.devShell.name} =
craneLib.devShell {
inherit (self') checks; inherit (self') checks;
# extra tooling dependencies # extra tooling dependencies
@@ -143,7 +145,8 @@
inputsFrom = [self'.packages.${cfg.package.name}]; inputsFrom = [self'.packages.${cfg.package.name}];
} }
// cfg.devShell.extraAttrs); // cfg.devShell.extraAttrs;
};
# Formatter for nix files, available through 'nix fmt' # Formatter for nix files, available through 'nix fmt'
treefmt = { treefmt = {
@@ -156,10 +159,13 @@
# Your custom packages # Your custom packages
# Accessible through 'nix build', 'nix shell', 'nix run', etc # Accessible through 'nix build', 'nix shell', 'nix run', etc
packages.${cfg.package.name} = lib.mkIf cfg.package.enable (craneLib.buildPackage { packages = lib.mkIf cfg.package.enable {
${cfg.package.name} =
craneLib.buildPackage {
inherit src buildInputs nativeBuildInputs cargoArtifacts; inherit src buildInputs nativeBuildInputs cargoArtifacts;
} }
// cfg.package.extraAttrs); // cfg.package.extraAttrs;
};
checks = { checks = {
clippy = craneLib.cargoClippy { clippy = craneLib.cargoClippy {