Skip to content

Commit 3c9df19

Browse files
committed
Remove stack references, we don't care for it
1 parent fd53039 commit 3c9df19

10 files changed

+16
-972
lines changed

lib/call-stack-to-nix.nix

Lines changed: 0 additions & 94 deletions
This file was deleted.

lib/default.nix

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ in {
9595
|| isBenchmark componentId;
9696
mayHaveExecutable = isExecutableType;
9797

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`
9999
# This is used to make the default `packages` list for `shellFor`.
100100
isLocalPackage = p: p.isLocal or false;
101101
selectLocalPackages = lib.filterAttrs (_n: p: p != null && isLocalPackage p);
@@ -269,11 +269,6 @@ in {
269269
then versionOrMod
270270
else [versionOrMod];
271271

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-
277272
inherit (import ./cabal-project-parser.nix {
278273
inherit pkgs;
279274
}) parseIndexState parseSourceRepositoryPackages parseRepositories parseSourceRepositoryPackageBlock parseRepositoryBlock;
@@ -316,13 +311,13 @@ in {
316311
};
317312

318313
# 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).
320315
# The resulting config is then passed to the project function's implementation.
321316
evalProjectModule = projectType: m: f:
322317
let project = f
323318
(lib.evalModules {
324319
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
326321
(import ../modules/project-common.nix)
327322
(import projectType)
328323
# Pass the pkgs and the buildProject to the modules
@@ -496,10 +491,6 @@ in {
496491
# Build the plan-nix and check it if materialized
497492
// lib.optionalAttrs (checkedProject ? plan-nix) {
498493
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;
503494
};
504495

505496
mkFlake = project: {

lib/fetch-external.nix

Lines changed: 0 additions & 16 deletions
This file was deleted.

lib/fetch-resolver.nix

Lines changed: 0 additions & 37 deletions
This file was deleted.

lib/ghcjs-project.nix

Lines changed: 0 additions & 197 deletions
This file was deleted.

0 commit comments

Comments
 (0)