haskellPackages.developPackage: Add overrides argument

(cherry picked from commit b349d4b)
NixOS · Jun 12, 2017 · d10fe64 · d10fe64
1 parent 1c5f4ae
commit d10fe64
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
@@ -129,16 +129,20 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
                                else self.callHackage;
         in generateExprs name src {}) overrides;
 
-    # : { root : Path, source-overrides : Defaulted (Either Path VersionNumber } -> NixShellAwareDerivation
+    # : { root : Path
+    #   , source-overrides : Defaulted (Either Path VersionNumber
+    #   , overrides : Defaulted (HaskellPackageOverrideSet)
+    #   } -> NixShellAwareDerivation
     # Given a path to a haskell package directory whose cabal file is
-    # named the same as the directory name, and an optional set of
+    # named the same as the directory name, an optional set of
     # source overrides as appropriate for the 'packageSourceOverrides'
-    # function, return a derivation appropriate for nix-build or nix-shell
+    # function, and an optional set of arbitrary overrides,
+    # return a derivation appropriate for nix-build or nix-shell
     # to build that package.
-    developPackage = { root, source-overrides ? {} }:
+    developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }:
       let name = builtins.baseNameOf root;
           drv =
-            (extensible-self.extend (self.packageSourceOverrides source-overrides)).callCabal2nix name root {};
+            (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {};
       in if pkgs.lib.inNixShell then drv.env else drv;
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);