From 72ae88b019007abfc1f2cc41ad99c217a76b5a8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Sep 2011 19:45:45 +0000 Subject: [PATCH] haskell-WebBits: renamed nix file for consistency svn path=/nixpkgs/trunk/; revision=29041 --- .../libraries/haskell/WebBits/{default.nix => 2.0.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/WebBits/{default.nix => 2.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/WebBits/default.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/WebBits/default.nix rename to pkgs/development/libraries/haskell/WebBits/2.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4d1cef4d506..ddfe8da9fec 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1194,13 +1194,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); warp = callPackage ../development/libraries/haskell/warp {}; - WebBits = callPackage ../development/libraries/haskell/WebBits { - parsec = self.parsec2; - }; - WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { parsec = self.parsec2; }; + 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 {};