Skip to content

Commit e453c42

Browse files
committed
Fix stack
1 parent be9963d commit e453c42

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

overlays/haskell.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ final: prev: {
4646

4747
# All packages from Hackage as Nix expressions
4848
hackageSrc = sources.hackage;
49-
hackage = {}; # TODO remove completely
49+
# The only stack projects need hackage.nix now
50+
hackageForStack = import hackageSrc;
5051

5152
# Contains the hashes of the cabal 01-index.tar.gz for given
5253
# index states. Starting from April 1st 2019.
@@ -70,6 +71,7 @@ final: prev: {
7071
, pkg-def-extras ? [] # Additional packages to augment the Base package set `pkg-def` with.
7172
, modules ? []
7273
, extra-hackages ? [] # Extra Hackage repositories to use besides main one.
74+
, hackage
7375
}@args:
7476

7577
let
@@ -131,6 +133,7 @@ final: prev: {
131133
modules = [ { doExactConfig = true; } patchesModule ]
132134
++ modules
133135
++ map removeStackSpecial (stack-pkgs.modules or []);
136+
hackage = hackageForStack;
134137
};
135138

136139
# Create a Haskell package set based on a Cabal configuration.
@@ -163,6 +166,7 @@ final: prev: {
163166
++ modules
164167
++ plan-pkgs.modules or [];
165168
inherit extra-hackages;
169+
hackage = {};
166170
};
167171

168172
# Package sets for all stackage snapshots.

0 commit comments

Comments
 (0)