From bb9e23837a3c4334133efa9976cd822b2bf333e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 22 Jun 2017 13:24:11 +0200 Subject: [PATCH] haskellPackages: make configuration-{nix,common}.nix configurable 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 --- pkgs/development/haskell-modules/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 6b5812cd07f5..32fa46f111dd 100644 --- 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