From 172507f79e3894408cb4804f270f16896936bf96 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Oct 2011 19:37:34 +0000
Subject: [PATCH] haskell-WebBits: added version 2.1
svn path=/nixpkgs/trunk/; revision=29909
---
.../libraries/haskell/WebBits/2.1.nix | 18 ++++++++++++++++++
pkgs/top-level/haskell-packages.nix | 11 ++++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 pkgs/development/libraries/haskell/WebBits/2.1.nix
diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix
new file mode 100644
index 000000000000..915ff0b1d60e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, parsec, syb }:
+
+cabal.mkDerivation (self: {
+ pname = "WebBits";
+ version = "2.1";
+ sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
+ buildDepends = [ mtl parsec syb ];
+ meta = {
+ homepage = "http://www.cs.brown.edu/research/plt/";
+ description = "JavaScript analysis tools";
+ 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/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a93d654b0fa8..74bff87bf792 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1299,10 +1299,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
parsec = self.parsec2;
};
- WebBits = self.WebBits_2_0;
+ WebBits_2_1 = callPackage ../development/libraries/haskell/WebBits/2.1.nix {};
+ WebBits = self.WebBits_2_1;
- WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {};
- WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {};
+ WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {
+ WebBits = self.WebBits_2_0;
+ };
+ WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {
+ WebBits = self.WebBits_2_0;
+ };
WebBitsHtml = self.WebBitsHtml_1_0_2;
webRoutes = callPackage ../development/libraries/haskell/web-routes {};