From 7d44fab64fe49a4e22215722e712ba57ab44a188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Thu, 15 Apr 2010 13:25:43 +0000
Subject: [PATCH] Added salvia and dependencies.

svn path=/nixpkgs/trunk/; revision=21095
---
 .../haskell/MaybeT-transformers/default.nix   | 14 +++++++++
 .../libraries/haskell/bimap/default.nix       | 13 ++++++++
 .../libraries/haskell/fclabels/default.nix    |  2 ++
 .../libraries/haskell/pureMD5/default.nix     | 14 +++++++++
 .../libraries/haskell/safe/default.nix        | 13 ++++++++
 .../haskell/salvia-protocol/default.nix       | 14 +++++++++
 .../libraries/haskell/salvia/default.nix      | 19 ++++++++++++
 .../libraries/haskell/text/default.nix        |  9 ++++--
 .../haskell/threadmanager/default.nix         | 13 ++++++++
 pkgs/top-level/haskell-packages.nix           | 31 +++++++++++++++++++
 10 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
 create mode 100644 pkgs/development/libraries/haskell/bimap/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pureMD5/default.nix
 create mode 100644 pkgs/development/libraries/haskell/safe/default.nix
 create mode 100644 pkgs/development/libraries/haskell/salvia-protocol/default.nix
 create mode 100644 pkgs/development/libraries/haskell/salvia/default.nix
 create mode 100644 pkgs/development/libraries/haskell/threadmanager/default.nix

diff --git a/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
new file mode 100644
index 000000000000..4b67f75ad252
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MaybeT-transformers/default.nix
@@ -0,0 +1,14 @@
+{cabal, transformers, monadsFd}:
+
+cabal.mkDerivation (self : {
+  pname = "MaybeT-transformers";
+  version = "0.1";
+  sha256 = "b24b78e3a895587722c9ce899f9ef07b509db1a5b3b86f5b7b0e8bc986c8fb8f";
+  propagatedBuildInputs = [transformers monadsFd];
+  meta = {
+    description = "Support for computations with failures";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix
new file mode 100644
index 000000000000..ec2dd1d36322
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bimap/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "bimap";
+  version = "0.2.4";
+  sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5";
+  meta = {
+    description = "Bidirectional mapping between two key types";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index ceb8692bce96..4c13955a77e5 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -7,6 +7,8 @@ cabal.mkDerivation (self : {
   propagatedBuildInputs = [monadsFd];
   meta = {
     description = "First class accessor labels";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix
new file mode 100644
index 000000000000..1e56df6d4bd7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pureMD5/default.nix
@@ -0,0 +1,14 @@
+{cabal, binary}:
+
+cabal.mkDerivation (self : {
+  pname = "pureMD5";
+  version = "1.0.0.3";
+  sha256 = "3698e5bc8a0e20bed91b52f976235e52f2c1dd876aa40e94d6c7be293d67d482";
+  propagatedBuildInputs = [binary];
+  meta = {
+    description = "An unrolled implementation of MD5 purely in Haskell";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix
new file mode 100644
index 000000000000..0c41af7e1d3f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/safe/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "safe";
+  version = "0.2";
+  sha256 = "73b9a247c3ba8092236c8c912687399778ff31bf3df42d707563a1528a6fc0e0";
+  meta = {
+    description = "Library for safe (pattern match free) functions";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/salvia-protocol/default.nix b/pkgs/development/libraries/haskell/salvia-protocol/default.nix
new file mode 100644
index 000000000000..e1418423ae80
--- /dev/null
+++ b/pkgs/development/libraries/haskell/salvia-protocol/default.nix
@@ -0,0 +1,14 @@
+{cabal, fclabels, parsec, safe, split, utf8String, bimap}:
+
+cabal.mkDerivation (self : {
+  pname = "salvia-protocol";
+  version = "1.0.1";
+  sha256 = "6b2312e52efaa81feec7461b1a3db77e1f2a8dfd829ae878b614c206a5e48928";
+  propagatedBuildInputs = [fclabels parsec safe split utf8String bimap];
+  meta = {
+    description = "Salvia webserver protocol suite";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/salvia/default.nix b/pkgs/development/libraries/haskell/salvia/default.nix
new file mode 100644
index 000000000000..658273ead31e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/salvia/default.nix
@@ -0,0 +1,19 @@
+{cabal, fclabels, MaybeTTransformers, monadsFd, pureMD5, safe,
+ salviaProtocol, split, text, threadmanager, transformers, utf8String,
+ network, stm, time}:
+
+cabal.mkDerivation (self : {
+  pname = "salvia";
+  version = "1.0.0";
+  sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1";
+  propagatedBuildInputs = [
+    fclabels MaybeTTransformers monadsFd pureMD5 safe salviaProtocol
+    split text threadmanager transformers utf8String network stm time
+  ];
+  meta = {
+    description = "Modular web application framework";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/text/default.nix b/pkgs/development/libraries/haskell/text/default.nix
index 3fb02befcfa1..e2c4b2f13d6e 100644
--- a/pkgs/development/libraries/haskell/text/default.nix
+++ b/pkgs/development/libraries/haskell/text/default.nix
@@ -1,11 +1,14 @@
-{cabal}:
+{cabal, deepseq}:
 
 cabal.mkDerivation (self : {
   pname = "text";
-  version = "0.5";
-  sha256 = "02c3b6a57e1250dc0945d909dffdc256c2e720e751b8a75d6117522c85100fc2";
+  version = "0.7.1.0";
+  sha256 = "a6daa0ee43ddede620363ab26614fef69361bd5b8f77aa6918b5a4ecb083f425";
+  propagatedBuildInputs = [deepseq];
   meta = {
     description = "An efficient package Unicode text type";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix
new file mode 100644
index 000000000000..b80b374baa7f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/threadmanager/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "threadmanager";
+  version = "0.1.3";
+  sha256 = "22ca45d7e32518736abb9cde6d2d14163128888769fc02bbc2641fd97318a15a";
+  meta = {
+    description = "Simple thread management";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6ea8dc5825da..81563402d50f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -49,6 +49,10 @@ rec {
     inherit cabal;
   };
 
+  bimap = import ../development/libraries/haskell/bimap {
+    inherit cabal;
+  };
+
   binary = import ../development/libraries/haskell/binary {
     inherit cabal;
   };
@@ -380,6 +384,10 @@ rec {
     inherit cabal benchpress;
   };
 
+  MaybeTTransformers = import ../development/libraries/haskell/MaybeT-transformers {
+    inherit cabal transformers monadsFd;
+  };
+
   mmap = import ../development/libraries/haskell/mmap {
     inherit cabal;
   };
@@ -482,6 +490,10 @@ rec {
     inherit cabal;
   };
 
+  pureMD5 = import ../development/libraries/haskell/pureMD5 {
+    inherit cabal binary;
+  };
+
   QuickCheck  = QuickCheck1;
 
   QuickCheck1 = import ../development/libraries/haskell/QuickCheck {
@@ -532,6 +544,21 @@ rec {
     inherit cabal;
   };
 
+  safe = import ../development/libraries/haskell/safe {
+    inherit cabal;
+  };
+
+  salvia = import ../development/libraries/haskell/salvia {
+    inherit cabal fclabels MaybeTTransformers monadsFd pureMD5
+      safe salviaProtocol split text threadmanager transformers
+      utf8String stm time;
+    network = network2217;
+  };
+
+  salviaProtocol = import ../development/libraries/haskell/salvia-protocol {
+    inherit cabal fclabels parsec safe split utf8String bimap;
+  };
+
   scion = import ../development/libraries/haskell/scion {
     inherit cabal ghcPaths ghcSyb hslogger json multiset time uniplate;
   };
@@ -606,6 +633,10 @@ rec {
   };
 
   text = import ../development/libraries/haskell/text {
+    inherit cabal deepseq;
+  };
+
+  threadmanager = import ../development/libraries/haskell/threadmanager {
     inherit cabal;
   };