From d2c55eb34a7fc9a1a9448b43e6fd33592442e793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 14 Aug 2018 11:42:10 +0100
Subject: [PATCH] haskellPackages.hpack: set to newest hpack to avoid
 conflicting hpack versions in closure

---
 .../haskell-modules/configuration-common.nix  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 80ec7194465..d15d121776b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1077,19 +1077,18 @@ self: super: {
   haddock-library = doJailbreak (dontCheck super.haddock-library);
   haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
 
+  # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
+  # Lets remove this once the LTS has upraded to 0.29.6.
+  hpack = super.hpack_0_29_6;
+
   cabal2nix =
-    let
-      # The test suite does not know how to find the 'cabal2nix' binary.
-      drv1 = overrideCabal super.cabal2nix (drv: {
-               preCheck = ''
-                 export PATH="$PWD/dist/build/cabal2nix:$PATH"
-                 export HOME="$TMPDIR/home"
-               '';
-             });
-       # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
-       # Lets remove this once the LTS has upraded to 0.29.6.
-       drv2 = drv1.override { hpack = self.hpack_0_29_6; };
-    in drv2;
+    # The test suite does not know how to find the 'cabal2nix' binary.
+    overrideCabal super.cabal2nix (drv: {
+      preCheck = ''
+        export PATH="$PWD/dist/build/cabal2nix:$PATH"
+        export HOME="$TMPDIR/home"
+      '';
+    });
 
   # Break out of "aeson <1.3, temporary <1.3".
   stack = doJailbreak super.stack;