Author: simons
Date: Fri Aug 12 00:18:32 2011
New Revision: 28498
URL: https://svn.nixos.org/websvn/nix/?rev=28498&sc=1

Log:
Renamed default version of haskell json into a version-specific file.

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/json/0.4.4.nix
      - copied, changed from r28497, 
nixpkgs/trunk/pkgs/development/libraries/haskell/json/default.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/json/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/json/0.4.4.nix (from r28497, 
nixpkgs/trunk/pkgs/development/libraries/haskell/json/default.nix)
==============================================================================

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Thu Aug 11 16:33:47 
2011        (r28497)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Aug 12 00:18:32 
2011        (r28498)
@@ -783,9 +783,9 @@
     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 
{};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to