|
95 | 95 | || isBenchmark componentId;
|
96 | 96 | mayHaveExecutable = isExecutableType;
|
97 | 97 |
|
98 |
| - # Was there a reference to the package source in the `cabal.project` or `stack.yaml` file. |
| 98 | + # Was there a reference to the package source in the `cabal.project` |
99 | 99 | # This is used to make the default `packages` list for `shellFor`.
|
100 | 100 | isLocalPackage = p: p.isLocal or false;
|
101 | 101 | selectLocalPackages = lib.filterAttrs (_n: p: p != null && isLocalPackage p);
|
@@ -269,11 +269,6 @@ in {
|
269 | 269 | then versionOrMod
|
270 | 270 | else [versionOrMod];
|
271 | 271 |
|
272 |
| - # Find the resolver in the stack.yaml file and fetch it if a sha256 value is provided |
273 |
| - fetchResolver = import ./fetch-resolver.nix { |
274 |
| - inherit (pkgs.buildPackages) pkgs; |
275 |
| - }; |
276 |
| - |
277 | 272 | inherit (import ./cabal-project-parser.nix {
|
278 | 273 | inherit pkgs;
|
279 | 274 | }) parseIndexState parseSourceRepositoryPackages parseRepositories parseSourceRepositoryPackageBlock parseRepositoryBlock;
|
@@ -316,13 +311,13 @@ in {
|
316 | 311 | };
|
317 | 312 |
|
318 | 313 | # Run evalModules passing the project function argument (m) as a module along with
|
319 |
| - # the the a projectType module (../modules/cabal-project.nix or ../modules/stack-project.nix). |
| 314 | + # the the a projectType module (../modules/cabal-project.nix). |
320 | 315 | # The resulting config is then passed to the project function's implementation.
|
321 | 316 | evalProjectModule = projectType: m: f:
|
322 | 317 | let project = f
|
323 | 318 | (lib.evalModules {
|
324 | 319 | modules = (if builtins.isList m then m else [m]) ++ [
|
325 |
| - # Include ../modules/cabal-project.nix or ../modules/stack-project.nix |
| 320 | + # Include ../modules/cabal-project.nix |
326 | 321 | (import ../modules/project-common.nix)
|
327 | 322 | (import projectType)
|
328 | 323 | # Pass the pkgs and the buildProject to the modules
|
@@ -496,10 +491,6 @@ in {
|
496 | 491 | # Build the plan-nix and check it if materialized
|
497 | 492 | // lib.optionalAttrs (checkedProject ? plan-nix) {
|
498 | 493 | inherit (checkedProject) plan-nix;
|
499 |
| - } |
500 |
| - # Build the stack-nix and check it if materialized |
501 |
| - // lib.optionalAttrs (checkedProject ? stack-nix) { |
502 |
| - inherit (checkedProject) stack-nix; |
503 | 494 | };
|
504 | 495 |
|
505 | 496 | mkFlake = project: {
|
|
0 commit comments