summaryrefslogtreecommitdiffstats
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
commit44c4c2cbb4a4ecd907a86a78cb9a292a4823f72b (patch)
treee105444cb3cb5f3a0c82f9fa62a8b5b48902f4c3
parent78a283d3fdde14672da42e2a6f89c1e78e895e67 (diff)
parent5de8b8530cb436118db192d90824bc6efdfda18a (diff)
Merge remote-tracking branch 'ni/für-lassulus'
-rw-r--r--krebs/5pkgs/haskell/default.nix10
-rw-r--r--tv/5pkgs/haskell/default.nix12
2 files changed, 14 insertions, 8 deletions
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix
index 98cbcb3b9..7e9ee7521 100644
--- a/krebs/5pkgs/haskell/default.nix
+++ b/krebs/5pkgs/haskell/default.nix
@@ -8,11 +8,13 @@ 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;
+ });
}
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;
+ });
}