Skip to content

Commit 3aae5ae

Browse files
TravisWhitakerTravis Whitaker
and
Travis Whitaker
authoredMar 21, 2025
fix mkSnapshot (#2336)
Co-authored-by: Travis Whitaker <[email protected]>
1 parent 42f73d0 commit 3aae5ae

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed
 

‎overlays/haskell.nix

+5-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,11 @@ final: prev: {
165165
};
166166

167167
# Package sets for all stackage snapshots.
168-
snapshots = import ../snapshots.nix { inherit (final) lib ghc-boot-packages; inherit mkPkgSet stackage excludeBootPackages; };
168+
snapshots = import ../snapshots.nix {
169+
inherit (final) lib ghc-boot-packages;
170+
inherit mkPkgSet stackage excludeBootPackages;
171+
hackage = hackageForStack;
172+
};
169173
# Pick a recent LTS snapshot to be our "default" package set.
170174
haskellPackages =
171175
if final.stdenv.targetPlatform.isAarch64 && final.stdenv.buildPlatform.isAarch64

‎snapshots.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
# A particular package in a snapshot would be accessed with:
77
# snapshots."lts-13.18".conduit
88

9-
{ lib, mkPkgSet, stackage, excludeBootPackages, ghc-boot-packages }:
9+
{ lib, mkPkgSet, stackage, excludeBootPackages, ghc-boot-packages, hackage }:
1010

1111
with lib;
1212

1313
let
1414
mkSnapshot = name: pkg-def: (let pkgSet = mkPkgSet {
15+
inherit hackage;
1516
pkg-def = excludeBootPackages null pkg-def;
1617
# ghc-boot-packages are needed for the reinstallable ghc library and
1718
# are constructed from the patched ghc source.

0 commit comments

Comments
 (0)