From 24ff52e62e637d62cc6c28f526ac7626d60b69e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 9 Feb 2012 14:38:01 +0000
Subject: [PATCH] haskell-json: dropped obsolete version 0.4.4

svn path=/nixpkgs/trunk/; revision=32161
---
 .../libraries/haskell/json/0.4.4.nix            | 17 -----------------
 .../haskell/json/{0.5.nix => default.nix}       |  0
 pkgs/top-level/haskell-packages.nix             |  4 +---
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/json/0.4.4.nix
 rename pkgs/development/libraries/haskell/json/{0.5.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/json/0.4.4.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix
deleted file mode 100644
index a318cf3c5ee..00000000000
--- a/pkgs/development/libraries/haskell/json/0.4.4.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "json";
-  version = "0.4.4";
-  sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    description = "Support for serialising Haskell to and from JSON";
-    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/json/0.5.nix b/pkgs/development/libraries/haskell/json/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/json/0.5.nix
rename to pkgs/development/libraries/haskell/json/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6bcd3516449..8f429052eb5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -927,9 +927,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     WebBitsHtml = self.WebBitsHtml_1_0_1;
   };
 
-  json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {};
-  json_0_5 = callPackage ../development/libraries/haskell/json/0.5.nix {};
-  json = self.json_0_4_4;
+  json = callPackage ../development/libraries/haskell/json {};
 
   jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {};