Trying to update haxr, but not finished.

svn path=/nixpkgs/trunk/; revision=15283

3 files changed, 20 insertions, 5 deletions

diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
new file mode 100644
index 000000000000..ba4b1edcc95f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "dataenc";
+  version = "0.11.1";
+  sha256 = "1212dbed8a1b8f80140d6450a7635a4365bc5733a00e2b96d00bcc526396c6bc";
+  meta = {
+    description = "Data encoding library";
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix
index 002b6ff7e618..0f25200516bb 100644
--- a/pkgs/development/libraries/haskell/haxr/default.nix
+++ b/pkgs/development/libraries/haskell/haxr/default.nix
@@ -1,12 +1,12 @@
-{cabal, HaXml, HTTP}:
+{cabal, HaXml, HTTP, dataenc, time}:
 
 cabal.mkDerivation (self : {
   pname = "haxr";
-  version = "3000.0.1";
-  sha256 = "1sppfd8qyqggfh5m8phxdn40x17g97q6j3a8d5wspy7kcmg2qaci";
+  version = "3000.1.1.2";
+  sha256 = "c24741a92e27d851a3376158230a52782c1e2b494405ebdde1d256819598c8e8";
   meta = {
     description = "a Haskell library for writing XML-RPC client and server applications";
   };
-  propagatedBuildInputs = [HaXml HTTP];
+  propagatedBuildInputs = [HaXml HTTP dataenc time];
 })
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d13141ca9322..ffbf72e21fd7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -46,6 +46,10 @@ rec {
     inherit cabal;
   };
 
+  dataenc = import ../development/libraries/haskell/dataenc {
+    inherit cabal;
+  };
+
   editline = import ../development/libraries/haskell/editline {
     inherit (pkgs) libedit;
     inherit cabal;
@@ -104,7 +108,7 @@ rec {
   };
 
   haxr = import ../development/libraries/haskell/haxr {
-    inherit cabal HaXml HTTP;
+    inherit cabal HaXml HTTP dataenc time;
   };
 
   haxr_th = import ../development/libraries/haskell/haxr-th {