haskellPackages adding multiset & filepath

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

3 files changed, 33 insertions, 0 deletions

diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix
new file mode 100644
index 00000000000..08d46f0c71f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/filepath/default.nix
@@ -0,0 +1,12 @@
+{ cabal} :
+
+cabal.mkDerivation (self : {
+  pname = "filepath";
+  version = "1.1.0.2";
+  sha256 = "1mkckshbpmgp7z97vc923x1qph8brqh9wcnb90kbv46bhiza277q";
+  propagatedBuildInputs = [];
+  meta = {
+    description = "Library for manipulating FilePath's in a cross platform way";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix
new file mode 100644
index 00000000000..3091af54f1c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/multiset/default.nix
@@ -0,0 +1,13 @@
+{cabal, syb}:
+
+cabal.mkDerivation (self : {
+  pname = "multiset";
+  version = "0.1";
+  sha256 = "0nh1bfis4r5yd4jd9dqwckiyrqa7j8yqn4ai676xb18rh4hwsv87";
+  propagatedBuildInputs = [syb];
+  meta = {
+    description = "A variation of Data.Set. Multisets, sometimes also called bags, can contain multiple copies of the same key";
+  };
+  patchPhase = '' sed -i 's/containers/containers, syb/' *.cabal ''; # add syb to library dependency list
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1b633154817..841a25b0df4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -81,6 +81,10 @@ rec {
     inherit cabal;
   };
 
+  filepath = import ../development/libraries/haskell/filepath {
+    inherit cabal;
+  };
+
   emgm = import ../development/libraries/haskell/emgm {
     inherit cabal;
   };
@@ -219,6 +223,10 @@ rec {
     inherit cabal;
   };
 
+  multiset = import ../development/libraries/haskell/multiset {
+    inherit cabal syb;
+  };
+
   network = import ../development/libraries/haskell/network {
     inherit cabal parsec;
   };