Author: simons
Date: Mon Sep  5 19:45:45 2011
New Revision: 29041
URL: https://svn.nixos.org/websvn/nix/?rev=29041&sc=1

Log:
haskell-WebBits: renamed nix file for consistency

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.0.nix
      - copied, changed from r29040, 
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/default.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/default.nix
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/2.0.nix (from r29040, 
nixpkgs/trunk/pkgs/development/libraries/haskell/WebBits/default.nix)
==============================================================================

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Mon Sep  5 19:31:49 
2011        (r29040)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Mon Sep  5 19:45:45 
2011        (r29041)
@@ -1194,13 +1194,13 @@
 
   warp = callPackage ../development/libraries/haskell/warp {};
 
-  WebBits = callPackage ../development/libraries/haskell/WebBits {
+  WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
     parsec = self.parsec2;
   };
-
-  WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
+  WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
     parsec = self.parsec2;
   };
+  WebBits = self.WebBits_2_0;
 
   WebBitsHtml = callPackage ../development/libraries/haskell/WebBits-Html {};
 
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to