From 82ee2c9c1160a11853aaa854ffc24a22846dcaf4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Aug 2011 00:18:32 +0000
Subject: [PATCH] Renamed default version of haskell json into a
 version-specific file.

svn path=/nixpkgs/trunk/; revision=28498
---
 .../libraries/haskell/json/{default.nix => 0.4.4.nix}         | 0
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/json/{default.nix => 0.4.4.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/json/default.nix
rename to pkgs/development/libraries/haskell/json/0.4.4.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1a897b0e0ba..7e6552d1d88 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -783,9 +783,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     WebBits = self.WebBits_1_0;
   };
 
-  json = callPackage ../development/libraries/haskell/json {};
-
   json_0_3_6 = callPackage ../development/libraries/haskell/json/0.3.6.nix {};
+  json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {};
+  json = self.json_0_4_4;
 
   jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {};