From 69add60b5cee1b54379554b35406a1de64f9f681 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Nov 2015 13:06:58 +0100
Subject: [PATCH] pkgs/development/haskell-modules: simplify use of standard
 fix' and extends functions

My original version of 'extend' had its arguments flipped compared to the one
we now have in stdenv.lib.
---
 pkgs/development/haskell-modules/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index a88396beb4d..27f3ccd9732 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -6,9 +6,7 @@
 
 let
 
-  fix = stdenv.lib.fix';
-
-  extend = stdenv.lib.flip stdenv.lib.extends;
+  inherit (stdenv.lib) fix' extends;
 
   haskellPackages = self:
     let
@@ -41,7 +39,7 @@ let
       });
 
       callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
-        overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args;
+        overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
       };
 
       mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope;
@@ -78,4 +76,8 @@ let
 
 in
 
-  fix (extend (extend (extend (extend haskellPackages commonConfiguration) compilerConfig) packageSetConfig) overrides)
+  fix'
+    (extends overrides
+      (extends packageSetConfig
+        (extends compilerConfig
+          (extends commonConfiguration haskellPackages))))