From f3f7cbde1905c663d8bcb36ad577dff26b17f300 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Oct 2011 19:45:38 +0000 Subject: [PATCH] updated to haskell-vector 0.9: aeson-native, blaze-textual-native, and cryptocipher svn path=/nixpkgs/trunk/; revision=29910 --- pkgs/top-level/haskell-packages.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 74bff87bf792..c0a88e9048c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -370,9 +370,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = self.vector_0_7_1; }; - aesonNative = callPackage ../development/libraries/haskell/aeson-native { - vector = self.vector_0_7_1; - }; + aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -426,9 +424,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = self.vector_0_7_1; }; - blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native { - vector = self.vector_0_7_1; - }; + blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; bmp = callPackage ../development/libraries/haskell/bmp {}; @@ -502,10 +498,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoApi_0_7 = callPackage ../development/libraries/haskell/crypto-api/0.7.nix {}; cryptoApi = self.cryptoApi_0_6_4; - cryptocipher = callPackage ../development/libraries/haskell/cryptocipher { - primitive = self.primitive_0_3_1; - vector = self.vector_0_7_1; - }; + cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; @@ -1063,9 +1056,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regular = callPackage ../development/libraries/haskell/regular {}; - repa = callPackage ../development/libraries/haskell/repa { - vector = self.vector_0_9; - }; + repa = callPackage ../development/libraries/haskell/repa {}; repaAlgorithms = callPackage ../development/libraries/haskell/repa-algorithms {};