Skip to content

fix mkSnapshot #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2025
Merged

fix mkSnapshot #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion overlays/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,11 @@ final: prev: {
};

# Package sets for all stackage snapshots.
snapshots = import ../snapshots.nix { inherit (final) lib ghc-boot-packages; inherit mkPkgSet stackage excludeBootPackages; };
snapshots = import ../snapshots.nix {
inherit (final) lib ghc-boot-packages;
inherit mkPkgSet stackage excludeBootPackages;
hackage = hackageForStack;
};
# Pick a recent LTS snapshot to be our "default" package set.
haskellPackages =
if final.stdenv.targetPlatform.isAarch64 && final.stdenv.buildPlatform.isAarch64
Expand Down
3 changes: 2 additions & 1 deletion snapshots.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
# A particular package in a snapshot would be accessed with:
# snapshots."lts-13.18".conduit

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

with lib;

let
mkSnapshot = name: pkg-def: (let pkgSet = mkPkgSet {
inherit hackage;
pkg-def = excludeBootPackages null pkg-def;
# ghc-boot-packages are needed for the reinstallable ghc library and
# are constructed from the patched ghc source.
Expand Down
Loading