summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-08-15 09:34:17 +0200
committerPeter Simons <simons@cryp.to>2018-08-19 13:36:20 +0200
commit08f48236d20a61a5ab4da1428d7db19bbdb5832f (patch)
tree3718b7c4cbd929bfaa2dc6e223767c80a74413d6 /pkgs/development/haskell-modules/configuration-common.nix
parent782e96e7d4069d5e823f4e5f130e0c252b590292 (diff)
downloadnixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.tar
nixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.tar.gz
nixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.tar.bz2
nixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.tar.lz
nixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.tar.xz
nixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.tar.zst
nixpkgs-08f48236d20a61a5ab4da1428d7db19bbdb5832f.zip
cabal2nix: update hpack override to the new version
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7999374a316..61c2da2b419 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1073,16 +1073,15 @@ self: super: {
 
   # 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 =
-    # 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"
-      '';
-    });
+  hpack = super.hpack_0_29_7;
+
+  # The test suite does not know how to find the 'cabal2nix' binary.
+  cabal2nix = 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;