about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-10-12 18:01:23 +0200
committerPeter Simons <simons@cryp.to>2014-10-13 09:12:25 +0200
commit5e118da0662974d9e0dea332611124183ac98b0b (patch)
tree17a34c9b88ec992873947194e31521584f3d54ac /pkgs
parent61b30d6b0aa4f655121d5ba12e2d2448b324d443 (diff)
downloadnixlib-5e118da0662974d9e0dea332611124183ac98b0b.tar
nixlib-5e118da0662974d9e0dea332611124183ac98b0b.tar.gz
nixlib-5e118da0662974d9e0dea332611124183ac98b0b.tar.bz2
nixlib-5e118da0662974d9e0dea332611124183ac98b0b.tar.lz
nixlib-5e118da0662974d9e0dea332611124183ac98b0b.tar.xz
nixlib-5e118da0662974d9e0dea332611124183ac98b0b.tar.zst
nixlib-5e118da0662974d9e0dea332611124183ac98b0b.zip
haskell-criterion: update to version 1.0.2.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/haskell/criterion/default.nix4
-rw-r--r--pkgs/top-level/haskell-packages.nix4
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 5a5ce89f732d..01ea05575652 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "1.0.1.0";
-  sha256 = "1mp4rm6jd8g38yyhfrxk1xzhp6mxrwwns9kl6494ylsdpsv0v4ll";
+  version = "1.0.2.0";
+  sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7d3cc8699956..bfbaaac7107c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -517,7 +517,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
-  criterion = callPackage ../development/libraries/haskell/criterion {};
+  criterion = callPackage ../development/libraries/haskell/criterion {
+    optparseApplicative = self.optparseApplicative_0_11_0_1;
+  };
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};