summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-09-13 21:26:47 +0200
committerlassulus <lassulus@lassul.us>2022-09-13 21:26:47 +0200
commitac8dba790b69169973d2c2f67f2ca458d49f144a (patch)
tree6f1cb5e8abf44908795bc0f397b75a650a71121a /tv
parenteab5c9abda6502cd04f47a4998d55ffbb598bce5 (diff)
parent40b197d6f0fa5d6f00d02b70d0f820862ae01c25 (diff)
Merge remote-tracking branch 'ni/für-lassulus'
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 fcede2f..33fd250 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;
+ });
}