Skip to content

Commit

Permalink
Fix stack
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Feb 4, 2025
1 parent be9963d commit e453c42
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion overlays/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ final: prev: {

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

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

let
Expand Down Expand Up @@ -131,6 +133,7 @@ final: prev: {
modules = [ { doExactConfig = true; } patchesModule ]
++ modules
++ map removeStackSpecial (stack-pkgs.modules or []);
hackage = hackageForStack;
};

# Create a Haskell package set based on a Cabal configuration.
Expand Down Expand Up @@ -163,6 +166,7 @@ final: prev: {
++ modules
++ plan-pkgs.modules or [];
inherit extra-hackages;
hackage = {};
};

# Package sets for all stackage snapshots.
Expand Down

0 comments on commit e453c42

Please sign in to comment.