From f4c75d125b78e8d6eb2fb80b5cc39125851996a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 27 Oct 2011 17:39:42 +0000
Subject: [PATCH] Generally switching to haskell-vector-0.9.

The price is that gamma's current upper bound has to be patched.

svn path=/nixpkgs/trunk/; revision=30066
---
 .../libraries/haskell/gamma/default.nix       |  3 ++
 pkgs/top-level/haskell-packages.nix           | 53 +++++--------------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix
index 523b9d233cac..feb57b32a890 100755
--- a/pkgs/development/libraries/haskell/gamma/default.nix
+++ b/pkgs/development/libraries/haskell/gamma/default.nix
@@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
   version = "0.7.0.1";
   sha256 = "0728b5mrzmj9hkaqvikl45jyi2p9hnkl2p6l9yv7wnw557yb0gb2";
   buildDepends = [ continuedFractions converge vector ];
+  preConfigure = ''
+    sed -i 's|\(vector.*\) && < 0.8|\1|' ${self.pname}.cabal
+  '';
   meta = {
     homepage = "https://github.com/mokus0/gamma";
     description = "Gamma function and related functions";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6cc9c70ca492..8bb9a4c4ad43 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -366,9 +366,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
-  aeson = callPackage ../development/libraries/haskell/aeson {
-    vector = self.vector_0_7_1;
-  };
+  aeson = callPackage ../development/libraries/haskell/aeson {};
 
   aesonNative = callPackage ../development/libraries/haskell/aeson-native {};
 
@@ -420,9 +418,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
 
-  blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {
-    vector = self.vector_0_7_1;
-  };
+  blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
 
   blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {};
 
@@ -490,9 +486,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cprngAes = callPackage ../development/libraries/haskell/cprng-aes {};
 
-  criterion = callPackage ../development/libraries/haskell/criterion {
-    vector = self.vector_0_7_1;
-  };
+  criterion = callPackage ../development/libraries/haskell/criterion {};
 
   Crypto = callPackage ../development/libraries/haskell/Crypto {};
 
@@ -587,9 +581,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   fingertree = callPackage ../development/libraries/haskell/fingertree {};
 
-  gamma = callPackage ../development/libraries/haskell/gamma {
-    vector = self.vector_0_7_1;
-  };
+  gamma = callPackage ../development/libraries/haskell/gamma {};
 
   gdiff = callPackage ../development/libraries/haskell/gdiff {};
 
@@ -882,10 +874,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
 
-  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {
-    primitive = self.primitive_0_3_1;
-    vector = self.vector_0_7_1;
-  };
+  mwcRandom = callPackage ../development/libraries/haskell/mwc-random {};
 
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
 
@@ -1006,9 +995,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   random = null; # core package until ghc-7.2.1
   random_newtime = self.random_1_0_0_2_newtime;
 
-  randomFu = callPackage ../development/libraries/haskell/random-fu {
-    vector = self.vector_0_7_1;
-  };
+  randomFu = callPackage ../development/libraries/haskell/random-fu {};
 
   randomSource = callPackage ../development/libraries/haskell/random-source {};
 
@@ -1082,22 +1069,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
-  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {
-    vector = self.vector_0_7_1;
-  };
+  snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};
 
-  snapServer = callPackage ../development/libraries/haskell/snap/server.nix {
-    vector = self.vector_0_7_1;
-  };
+  snapServer = callPackage ../development/libraries/haskell/snap/server.nix {};
 
   stateref = callPackage ../development/libraries/haskell/stateref {};
 
   StateVar = callPackage ../development/libraries/haskell/StateVar {};
 
-  statistics = callPackage ../development/libraries/haskell/statistics {
-    primitive = self.primitive_0_3_1;
-    vector = self.vector_0_7_1;
-  };
+  statistics = callPackage ../development/libraries/haskell/statistics {};
 
   streamproc = callPackage ../development/libraries/haskell/streamproc {};
 
@@ -1216,9 +1196,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tls = callPackage ../development/libraries/haskell/tls {};
 
-  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
-    vector = self.vector_0_7_1;
-  };
+  tlsExtra = callPackage ../development/libraries/haskell/tls-extra {};
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
   transformers = self.transformers_0_2_2_0;
@@ -1265,15 +1243,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
   vector = self.vector_0_9;
 
-  vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {
-    primitive = self.primitive_0_3_1;
-    vector = self.vector_0_7_1;
-  };
+  vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
 
   vectorSpace = callPackage ../development/libraries/haskell/vector-space {};
 
   vty = callPackage ../development/libraries/haskell/vty {
-    vector = self.vector_0_7_1;
+    mtl = self.mtl2;
   };
 
   wai = callPackage ../development/libraries/haskell/wai {};
@@ -1345,9 +1320,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodForm = callPackage ../development/libraries/haskell/yesod-form {};
 
-  yesodJson = callPackage ../development/libraries/haskell/yesod-json {
-    vector = self.vector_0_7_1;
-  };
+  yesodJson = callPackage ../development/libraries/haskell/yesod-json {};
 
   yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {};