haskellPackages: make configuration-{nix,common}.nix configurable

domenkozar · domenkozar · commit 496c1f3f7d99 · 2017-06-22T14:41:58.000+02:00
The motivation is to be able to get rid of common configuration when initial packages differs since common configuration assumes a very specific version set. cc @jmitchell @peti (cherry picked from commit bb9e238) Signed-off-by: Domen Kožar <domen@dev.si>
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
@@ -3,6 +3,8 @@
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
 , initialPackages ? import ./hackage-packages.nix
+, configurationCommon ? import ./configuration-common.nix
+, configurationNix ? import ./configuration-nix.nix
 }:
 
 let
@@ -15,8 +17,8 @@ let
     inherit ghc extensible-self;
   };
 
-  commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
-  nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
+  commonConfiguration = configurationCommon { inherit pkgs; };
+  nixConfiguration = configurationNix { inherit pkgs; };
 
   extensible-self = makeExtensible
     (extends overrides
