summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-04-22 11:57:38 +0200
committerPeter Simons <simons@cryp.to>2013-04-22 14:14:39 +0200
commit6626810adb5d0773bcd6bb3b41989ba6460c5c97 (patch)
treec9ccee52d198182dbd98fe083d7d14c1aa2a9dee
parent9faf34d0a8f8994a2fb75a72e056863848da777a (diff)
downloadnixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.tar
nixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.tar.gz
nixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.tar.bz2
nixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.tar.lz
nixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.tar.xz
nixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.tar.zst
nixlib-6626810adb5d0773bcd6bb3b41989ba6460c5c97.zip
haskell-hashable: update to version 1.2.x
Except for Agda, which still needs old version.
-rw-r--r--pkgs/top-level/haskell-packages.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aaa2174e44d7..3248742b205c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -449,7 +449,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   acidState = callPackage ../development/libraries/haskell/acid-state {};
 
-  Agda = callPackage ../development/libraries/haskell/Agda {};
+  Agda = callPackage ../development/libraries/haskell/Agda {
+    hashable = self.hashable_1_1_2_5;
+    hashtables = self.hashtables.override { hashable = self.hashable_1_1_2_5; };
+    unorderedContainers = self.unorderedContainers.override { hashable = self.hashable_1_1_2_5; };
+  };
 
   accelerate = callPackage ../development/libraries/haskell/accelerate {};
 
@@ -1004,7 +1008,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
   hashable_1_2_0_6 = callPackage ../development/libraries/haskell/hashable/1.2.0.6.nix {};
-  hashable = self.hashable_1_1_2_5;
+  hashable = self.hashable_1_2_0_6;
 
   hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};