From 76167b5bd37f61138b0276cb62417df9faf26e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 11 May 2010 19:58:47 +0000
Subject: [PATCH] Added a few new Haskell libraries.

svn path=/nixpkgs/trunk/; revision=21733
---
 .../libraries/haskell/GlomeVec/default.nix       | 13 +++++++++++++
 .../libraries/haskell/bitmap/default.nix         | 13 +++++++++++++
 .../libraries/haskell/cmdargs/default.nix        | 14 ++++++++++++++
 .../libraries/haskell/stb-image/default.nix      | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix              | 16 ++++++++++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/GlomeVec/default.nix
 create mode 100644 pkgs/development/libraries/haskell/bitmap/default.nix
 create mode 100644 pkgs/development/libraries/haskell/cmdargs/default.nix
 create mode 100644 pkgs/development/libraries/haskell/stb-image/default.nix

diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
new file mode 100644
index 000000000000..4ca87d9bced2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "GlomeVec";
+  version = "0.1.2";
+  sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
+  meta = {
+    description = "Simple 3D vector library";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix
new file mode 100644
index 000000000000..aff1eea1f0c7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bitmap/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "bitmap";
+  version = "0.0.1";
+  sha256 = "281ad4d9234349cfd14f91977b48e2d1861c037f4b6562aa138cddd25c801a7e";
+  meta = {
+    description = "A library for handling and manipulating bitmaps";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
new file mode 100644
index 000000000000..b7d3e81160a8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -0,0 +1,14 @@
+{cabal, filepath, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "cmdargs";
+  version = "0.1";
+  sha256 = "1ec8a0b49dedc0b159c4e8f6b02ae57ba918b27d8648294998a13e04cf257ebf";
+  propagatedBuildInputs = [filepath mtl];
+  meta = {
+    description = "Command line argument processing";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix
new file mode 100644
index 000000000000..4574b80ce2a5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stb-image/default.nix
@@ -0,0 +1,14 @@
+{cabal, bitmap}:
+
+cabal.mkDerivation (self : {
+  pname = "stb-image";
+  version = "0.2";
+  sha256 = "7d027b6de52d07bbe439a84897aaa6e26a8f05c6fa6f4aeaa3060be23ae11937";
+  propagatedBuildInputs = [bitmap];
+  meta = {
+    description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
+    license = "free";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c13b50eff5a3..78da26b35e2e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -57,6 +57,10 @@ rec {
     inherit cabal;
   };
 
+  bitmap = import ../development/libraries/haskell/bitmap {
+    inherit cabal;
+  };
+
   bytestring = import ../development/libraries/haskell/bytestring {
     inherit cabal;
   };
@@ -78,6 +82,10 @@ rec {
     inherit cabal mtl network parsec xhtml;
   };
 
+  cmdargs = import ../development/libraries/haskell/cmdargs {
+    inherit cabal filepath mtl;
+  };
+
   colorizeHaskell = import ../development/libraries/haskell/colorize-haskell {
     inherit cabal ansiTerminal haskellLexer;
   };
@@ -206,6 +214,10 @@ rec {
     network = network2217;
   };
 
+  GlomeVec = import ../development/libraries/haskell/GlomeVec {
+    inherit cabal;
+  };
+
   GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix {
     inherit cabal;
     OpenGL = OpenGL2230;
@@ -679,6 +691,10 @@ rec {
     inherit cabal;
   };
 
+  stbImage = import ../development/libraries/haskell/stb-image {
+    inherit cabal bitmap;
+  };
+
   stm = import ../development/libraries/haskell/stm {
     inherit cabal;
   };