From fb37aed285161d0203790e5613b95418068d1cf2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 30 Aug 2011 08:55:14 +0000
Subject: [PATCH] Dropped obsolete versions of haskell-HaXml.

svn path=/nixpkgs/trunk/; revision=28917
---
 .../libraries/haskell/HaXml/1.13.3.nix        | 19 ------------------
 .../libraries/haskell/HaXml/1.20.2.nix        | 20 -------------------
 .../libraries/haskell/HaXml/1.22.3.nix        | 20 -------------------
 .../haskell/HaXml/{1.22.5.nix => default.nix} |  0
 pkgs/top-level/haskell-packages.nix           | 13 +++---------
 5 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/HaXml/1.13.3.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaXml/1.20.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/HaXml/1.22.3.nix
 rename pkgs/development/libraries/haskell/HaXml/{1.22.5.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix b/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
deleted file mode 100644
index 30794498a5a2..000000000000
--- a/pkgs/development/libraries/haskell/HaXml/1.13.3.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "HaXml";
-  version = "1.13.3";
-  sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
-  isLibrary = true;
-  isExecutable = true;
-  meta = {
-    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
-    description = "Utilities for manipulating XML documents";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.20.2.nix b/pkgs/development/libraries/haskell/HaXml/1.20.2.nix
deleted file mode 100644
index 2adab3b71593..000000000000
--- a/pkgs/development/libraries/haskell/HaXml/1.20.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, polyparse, random }:
-
-cabal.mkDerivation (self: {
-  pname = "HaXml";
-  version = "1.20.2";
-  sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ polyparse random ];
-  meta = {
-    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
-    description = "Utilities for manipulating XML documents";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.3.nix b/pkgs/development/libraries/haskell/HaXml/1.22.3.nix
deleted file mode 100644
index 99c692093f7f..000000000000
--- a/pkgs/development/libraries/haskell/HaXml/1.22.3.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, polyparse, random }:
-
-cabal.mkDerivation (self: {
-  pname = "HaXml";
-  version = "1.22.3";
-  sha256 = "10gbax7nih45ck5fg056gnfgzr7zyndxpvdhvx3af2wnrmilkcbh";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ polyparse random ];
-  meta = {
-    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
-    description = "Utilities for manipulating XML documents";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HaXml/1.22.5.nix b/pkgs/development/libraries/haskell/HaXml/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/HaXml/1.22.5.nix
rename to pkgs/development/libraries/haskell/HaXml/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6ba0a746186b..7d4893cc3be6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -693,18 +693,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
 
-  haxr = callPackage ../development/libraries/haskell/haxr {
-    HaXml = self.HaXml_1_22_5;
-  };
+  haxr = callPackage ../development/libraries/haskell/haxr {};
+
   haxr_th = callPackage ../development/libraries/haskell/haxr-th {};
 
-  HaXml_1_13_3 = callPackage ../development/libraries/haskell/HaXml/1.13.3.nix {};
-  HaXml_1_20_2 = callPackage ../development/libraries/haskell/HaXml/1.20.2.nix {};
-  HaXml_1_22_5 = callPackage ../development/libraries/haskell/HaXml/1.22.5.nix {};
-  HaXml113 = self.HaXml_1_13_3;
-  HaXml120 = self.HaXml_1_20_2;
-  HaXml122 = self.HaXml_1_22_5;
-  HaXml    = self.HaXml120;
+  HaXml = callPackage ../development/libraries/haskell/HaXml {};
 
   HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {};