Dropped obsolete versions of haskell-primitive and haskell-vector.

svn path=/nixpkgs/trunk/; revision=31285

5 files changed, 2 insertions, 45 deletions

diff --git a/pkgs/development/libraries/haskell/primitive/0.3.1.nix b/pkgs/development/libraries/haskell/primitive/0.3.1.nix
deleted file mode 100644
index 6e7b485eece0..000000000000
--- a/pkgs/development/libraries/haskell/primitive/0.3.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "primitive";
-  version = "0.3.1";
-  sha256 = "1903hx88ax4dgyyx00a0k86jy4mkqrprpn7arfy19dqqyfpb2ikj";
-  meta = {
-    homepage = "http://code.haskell.org/primitive";
-    description = "Wrappers for primitive operations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix b/pkgs/development/libraries/haskell/primitive/default.nix
index 62693a6d0965..62693a6d0965 100644
--- a/pkgs/development/libraries/haskell/primitive/0.4.0.1.nix
+++ b/pkgs/development/libraries/haskell/primitive/default.nix
diff --git a/pkgs/development/libraries/haskell/vector/0.7.1.nix b/pkgs/development/libraries/haskell/vector/0.7.1.nix
deleted file mode 100644
index 8762d148e281..000000000000
--- a/pkgs/development/libraries/haskell/vector/0.7.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, primitive }:
-
-cabal.mkDerivation (self: {
-  pname = "vector";
-  version = "0.7.1";
-  sha256 = "1cdbkabw49pgc1j5h96inpmhn8ly230885d22smmynrq369pmg07";
-  buildDepends = [ primitive ];
-  meta = {
-    homepage = "http://code.haskell.org/vector";
-    description = "Efficient Arrays";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/default.nix
index c5c06fe93e5c..c5c06fe93e5c 100644
--- a/pkgs/development/libraries/haskell/vector/0.9.1.nix
+++ b/pkgs/development/libraries/haskell/vector/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2c182e461f4a..b4fdbe463297 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1055,9 +1055,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
 
-  primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {};
-  primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {};
-  primitive = self.primitive_0_4_0_1;
+  primitive = callPackage ../development/libraries/haskell/primitive {};
 
   processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
 
@@ -1341,13 +1339,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Vec = callPackage ../development/libraries/haskell/Vec {};
 
-  vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {
-    primitive = self.primitive_0_3_1;
-  };
-  vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {
-    primitive = self.primitive_0_4_0_1;
-  };
-  vector = self.vector_0_9_1;
+  vector = callPackage ../development/libraries/haskell/vector {};
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};