Merge remote-tracking branch 'ni/master' into HEAD

1 files changed, 14 insertions, 9 deletions

diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix
index 1120356a7..64c5f9257 100644
--- a/krebs/5pkgs/haskell/default.nix
+++ b/krebs/5pkgs/haskell/default.nix
@@ -1,15 +1,20 @@
 with import <stockholm/lib>;
-
+let
+  overrides = self: super:
+    listToAttrs
+      (map
+        (name: nameValuePair (removeSuffix ".nix" name)
+                             (self.callPackage (./. + "/${name}") {}))
+        (filter
+          (name: name != "default.nix" && !hasPrefix "." name)
+          (attrNames (readDir ./.))));
+in
 self: super:
 {
+  haskell.packages = mapAttrs (_: pkgs: pkgs.override {
+    inherit overrides;
+  }) super.haskell.packages;
   haskellPackages = super.haskellPackages.override {
-    overrides = self: super:
-      listToAttrs
-        (map
-          (name: nameValuePair (removeSuffix ".nix" name)
-                               (self.callPackage (./. + "/${name}") {}))
-          (filter
-            (name: name != "default.nix" && !hasPrefix "." name)
-            (attrNames (readDir ./.))));
+    inherit overrides;
   };
 }