Skip to content

Commit e0c9a45

Browse files
committed
fixup! Provide hackage and stackage from haskell.nix
1 parent 6d57a5e commit e0c9a45

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

default.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@ let
6767
}@args:
6868

6969
let
70+
# The Stackage release referenced in the stack config
71+
pkg-def = stackage.${stack-pkgs.resolver};
7072
# The compiler referenced in the stack config
71-
compiler = (stack-pkgs.overlay hackage).compiler.nix-name;
73+
compiler = (stack-pkgs.overlay hackage).compiler or (pkg-def hackage).compiler;
7274
in self.mkPkgSet {
73-
pkg-def = stackage.${stack-pkgs.resolver};
75+
inherit pkg-def;
7476
pkg-def-overlays = [ stack-pkgs.overlay ] ++ pkg-def-overlays;
75-
modules = [ ghcHackagePatches.${compiler} ] ++ modules;
77+
modules = [ ghcHackagePatches.${compiler.nix-name} ] ++ modules;
7678
};
7779

7880
# Programs for generating Nix expressions from Cabal and Stack

0 commit comments

Comments
 (0)