Skip to content

Refactor overlay composition #3323

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
Nov 8, 2022
Merged

Refactor overlay composition #3323

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
28 changes: 17 additions & 11 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,23 @@
hlsSources =
builtins.mapAttrs (_: dir: gitignoreSource dir) sourceDirs;

extended = hpkgs:
(hpkgs.override (old: {
overrides = lib.composeExtensions (old.overrides or (_: _: { }))
haskellOverrides;
})).extend (hself: hsuper:
# disable all checks for our packages
builtins.mapAttrs (_: drv: haskell.lib.dontCheck drv)
(lib.composeExtensions
(haskell.lib.packageSourceOverrides hlsSources) tweaks hself
hsuper));

# Disable tests, but only for the packages mentioned in this overlay
#
# We don't want to disable tests for *all* packages
dontCheck = overlay: hself: hsuper:
builtins.mapAttrs (_: haskell.lib.dontCheck)
(overlay hself hsuper);

extended = hpkgs: hpkgs.override (old: {
overrides =
lib.fold
lib.composeExtensions
(old.overrides or (_: _: { }))
[ haskellOverrides
(dontCheck (haskell.lib.packageSourceOverrides hlsSources))
tweaks
];
});
in {
inherit hlsSources;

Expand Down