summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-07-04 13:37:43 +0200
committerPeter Simons <simons@cryp.to>2018-07-04 19:14:18 +0200
commit81a85ae4862f619fa3af04a829f7bf619e048299 (patch)
tree51794d0c3e9f09c4919fa2bf039d38a91b63ac2c
parent07db547c19e3283bfd3045c62bf1706b6fdadeba (diff)
downloadnixlib-81a85ae4862f619fa3af04a829f7bf619e048299.tar
nixlib-81a85ae4862f619fa3af04a829f7bf619e048299.tar.gz
nixlib-81a85ae4862f619fa3af04a829f7bf619e048299.tar.bz2
nixlib-81a85ae4862f619fa3af04a829f7bf619e048299.tar.lz
nixlib-81a85ae4862f619fa3af04a829f7bf619e048299.tar.xz
nixlib-81a85ae4862f619fa3af04a829f7bf619e048299.tar.zst
nixlib-81a85ae4862f619fa3af04a829f7bf619e048299.zip
haskell-criterion: update override for ghc 8.4.x
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 540615a8cb70..812c0cf55ac1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -123,9 +123,6 @@ self: super: {
     };
   });
 
-  ## Bounds related: it wants base-compat 0.9.
-  criterion = super.criterion_1_4_1_0;
-
   ## Unmerged
 
   ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3
@@ -395,6 +392,7 @@ self: super: {
   # Older versions don't compile.
   base-compat = self.base-compat_0_10_4;
   brick = self.brick_0_37_1;
+  criterion = super.criterion_1_5_0_0;
   dhall = self.dhall_1_15_0;
   # This is probably obsolete:
   # dhall_1_15_0 = doJailbreak super.dhall_1_15_0;  # support ansi-terminal 0.8.x