summaryrefslogtreecommitdiffstats
path: root/pkgs/haskell
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2026-11-16 02:36:26 +0000
committertv <tv@krebsco.de>2026-11-16 03:42:14 +0100
commitda2c5e514d576a46d60b780514977df4a422db68 (patch)
tree7d39281cc3d540e6ccd820a7fe0cc046a8233803 /pkgs/haskell
parent543e65e3fae2f9ad2d09e9cc7823e5299146668b (diff)
pkgs/haskell: use packageOverrides
Diffstat (limited to 'pkgs/haskell')
-rw-r--r--pkgs/haskell/default.nix36
1 files changed, 11 insertions, 25 deletions
diff --git a/pkgs/haskell/default.nix b/pkgs/haskell/default.nix
index de6bd80..77905fe 100644
--- a/pkgs/haskell/default.nix
+++ b/pkgs/haskell/default.nix
@@ -1,25 +1,11 @@
-let
- overrides = { lib, mylib }: self: super:
- mylib.mapNixDir (path: self.callPackage path {}) [
- ./.
- ] // {
- };
-in
- self: super: let
- inherit (super) lib mylib;
- in {
- haskell = super.haskell // {
- packages = lib.mapAttrs (name: value:
- if builtins.hasAttr "override" value
- then value.override (old: {
- overrides =
- lib.composeExtensions (old.overrides or (_: _: { })) (overrides { inherit lib mylib; });
- })
- else value
- ) super.haskell.packages;
- };
- haskellPackages = super.haskellPackages.override (old: {
- overrides =
- lib.composeExtensions (old.overrides or (_: _: { })) (overrides { inherit lib mylib; });
- });
- }
+self: super: let
+ inherit (super) lib mylib;
+in {
+ # nixpkgs applies packageOverrides to every Haskell package set, including
+ # haskellPackages.
+ haskell = super.haskell // {
+ packageOverrides = lib.composeExtensions super.haskell.packageOverrides
+ (hself: hsuper:
+ mylib.mapNixDir (path: hself.callPackage path {}) [ ./. ]);
+ };
+}