From 6626810adb5d0773bcd6bb3b41989ba6460c5c97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 22 Apr 2013 11:57:38 +0200 Subject: [PATCH] haskell-hashable: update to version 1.2.x Except for Agda, which still needs old version. --- pkgs/top-level/haskell-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aaa2174e44d..3248742b205 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 {};