From da2c5e514d576a46d60b780514977df4a422db68 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 16 Nov 2026 02:36:26 +0000 Subject: pkgs/haskell: use packageOverrides --- pkgs/haskell/default.nix | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'pkgs/haskell/default.nix') 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 {}) [ ./. ]); + }; +} -- cgit v1.3.1