summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-09-13 21:22:15 +0200
committertv <tv@krebsco.de>2022-09-13 21:22:41 +0200
commit5de8b8530cb436118db192d90824bc6efdfda18a (patch)
tree870c36ad8de849b39405188537a6355f876922e0 /tv
parent4005029bf6caa37d86490cb5d37dca1bc857909d (diff)
haskell overrides: admit old overrides
Diffstat (limited to 'tv')
-rw-r--r--tv/5pkgs/haskell/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/tv/5pkgs/haskell/default.nix b/tv/5pkgs/haskell/default.nix
index fcede2f9c..33fd2506a 100644
--- a/tv/5pkgs/haskell/default.nix
+++ b/tv/5pkgs/haskell/default.nix
@@ -10,11 +10,15 @@ in
haskell = super.haskell // {
packages = mapAttrs (name: value:
if hasAttr "override" value
- then value.override { inherit overrides; }
+ then value.override (old: {
+ overrides =
+ composeExtensions (old.overrides or (_: _: { })) overrides;
+ })
else value
) super.haskell.packages;
};
- haskellPackages = super.haskellPackages.override {
- inherit overrides;
- };
+ haskellPackages = super.haskellPackages.override (old: {
+ overrides =
+ composeExtensions (old.overrides or (_: _: { })) overrides;
+ });
}