diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/haskell/default.nix | 36 |
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 {}) [ ./. ]); + }; +} |
