Merge branch 'master' of git://github.com/soenkehahn/nixpkgs

packaging taggy and taggy-lens

pkgs/development/libraries/haskell/taggy-lens/default.nix

@@ -0,0 +1,17 @@
+{ cabal, doctest, hspec, lens, taggy, text, unorderedContainers }:
+
+cabal.mkDerivation (self: {
+  pname = "taggy-lens";
+  version = "0.1.1";
+  sha256 = "1c4xp8h47vxcy6lvldb73185z26fmgsjakml9b3zjnlfjihgl6kz";
+  buildDepends = [ lens taggy text unorderedContainers ];
+  testDepends = [
+    doctest hspec lens taggy text unorderedContainers
+  ];
+  meta = {
+    homepage = "http://github.com/alpmestan/taggy-lens";
+    description = "Lenses for the taggy html/xml parser";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/taggy/default.nix

@@ -0,0 +1,24 @@
+{ cabal, attoparsec, blazeHtml, blazeMarkup, hspec, hspecAttoparsec
+, text, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "taggy";
+  version = "0.1";
+  sha256 = "0qqz5h706k96i7gl8vvn4c044cd5wj1zjlr6cnlxxpii0pyiiwh1";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    attoparsec blazeHtml blazeMarkup text unorderedContainers vector
+  ];
+  testDepends = [
+    attoparsec blazeHtml blazeMarkup hspec hspecAttoparsec text
+    unorderedContainers vector
+  ];
+  meta = {
+    homepage = "http://github.com/alpmestan/taggy";
+    description = "Efficient and simple HTML/XML parsing library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/top-level/haskell-packages.nix

@@ -2223,6 +2223,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   tagged = callPackage ../development/libraries/haskell/tagged {};
 
+  taggy = callPackage ../development/libraries/haskell/taggy {};
+
+  taggyLens = callPackage ../development/libraries/haskell/taggy-lens {};
+
   tagshare = callPackage ../development/libraries/haskell/tagshare {};
 
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};