haskellPackages: adding bytestring, networkBytestring, getOptions, ghcSyb, hslogger, tar

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

10 files changed, 122 insertions, 3 deletions

diff --git a/pkgs/development/libraries/haskell/bytestring/default.nix b/pkgs/development/libraries/haskell/bytestring/default.nix
new file mode 100644
index 0000000000000..c694250a84745
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bytestring/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "bytestring";
+  version = "0.9.1.4";
+  name = self.fname;
+  sha256 = "00x620zkxhlmdxmb2icrq3a2wc6jichng6mn33xr2gsw102973xz";
+  extraBuildInputs = [];
+  meta = {
+    description = "A time and space-efficient implementation of byte vectors using packed Word8 arrays [..]";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/get-options/default.nix b/pkgs/development/libraries/haskell/get-options/default.nix
new file mode 100644
index 0000000000000..7c33707bf7018
--- /dev/null
+++ b/pkgs/development/libraries/haskell/get-options/default.nix
@@ -0,0 +1,12 @@
+{cabal, sourceByName, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "get-options";
+  version = "x"; # ? 
+  name = self.fname;
+  src = sourceByName "getOptions";
+  extraBuildInputs = [ mtl ];
+  meta = {
+    description = "simple to use get option library";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix
new file mode 100644
index 0000000000000..bc560bcd48651
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix
@@ -0,0 +1,12 @@
+{cabal, syb, sourceByName}:
+
+cabal.mkDerivation (self : {
+  pname = "hlint";
+  version = "1.4";
+  name = self.fname;
+  src = sourceByName "ghc_syb";
+  extraBuildInputs = [syb];
+  meta = {
+    description = "Source code suggestions";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/network-bytestring/default.nix b/pkgs/development/libraries/haskell/network-bytestring/default.nix
new file mode 100644
index 0000000000000..e18d2a24ec73a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-bytestring/default.nix
@@ -0,0 +1,12 @@
+{cabal, bytestring, network}:
+
+cabal.mkDerivation (self : {
+  pname = "network-bytestring";
+  version = "0.1.2.1";
+  name = self.fname;
+  sha256 = "0l5gxwc5pg49qyxb1jy3kn9j66a6pg9frw4c7dn1mrpqicm155am";
+  extraBuildInputs = [bytestring network];
+  meta = {
+    description = "Source code suggestions";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/syb/default.nix b/pkgs/development/libraries/haskell/syb/default.nix
new file mode 100644
index 0000000000000..93e503e7cdc1f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/syb/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "syb";
+  version = "0.1.0.1";
+  name = self.fname;
+  sha256 = "08nf4id26s5iasxzdy5jds6h87fy3a55zgw0zrig4dg6difmwjp3";
+  extraBuildInputs = [];
+  meta = {
+    description = "generics system described in the Scrap Your Boilerplate papers [..]";
+  };
+})
diff --git a/pkgs/development/misc/bleeding-edge-repos/default.nix b/pkgs/development/misc/bleeding-edge-repos/default.nix
index 552d41f1a1dce..873919178d6d8 100644
--- a/pkgs/development/misc/bleeding-edge-repos/default.nix
+++ b/pkgs/development/misc/bleeding-edge-repos/default.nix
@@ -73,5 +73,8 @@ args:
 
       # git repositories 
       hypertable =  { type="git"; url="git://scm.hypertable.org/pub/repos/hypertable.git"; groups=""; };
+
+      getOptions = { type="darcs"; url="http://repetae.net/john/repos/GetOptions"; groups=""; };
+      ghc_syb = { type = "git"; url = "git://github.com/nominolo/ghc-syb.git"; groups="haskell scien"; };
     } // kde4support // getConfig [ "bleedingEdgeRepos" "repos" ] {};
 }
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
new file mode 100644
index 0000000000000..dbd0b9ca30b5f
--- /dev/null
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl ,network, time}:
+
+cabal.mkDerivation (self : {
+  pname = "hslogger";
+  version = "1.0.7";
+  name = self.fname;
+  sha256 = "0fb8aagylrr5z19801szj868apcns8lafc4ydx9v0ka2lbmjqvbz";
+  extraBuildInputs = [ mtl time network ];
+  meta = {
+    description = "logger library modeled after pylogger";
+  };
+})
diff --git a/pkgs/development/tools/haskell/tar/default.nix b/pkgs/development/tools/haskell/tar/default.nix
new file mode 100644
index 0000000000000..8672e0db95019
--- /dev/null
+++ b/pkgs/development/tools/haskell/tar/default.nix
@@ -0,0 +1,12 @@
+{cabal, binary}:
+
+cabal.mkDerivation (self : {
+  pname = "tar";
+  version = "0.3.1.0";
+  name = self.fname;
+  sha256 = "1n16sq5y7x30r1k7ydxmncn9x2nx3diildzyfxjy2b8drxp4jr03";
+  extraBuildInputs = [binary];
+  meta = {
+    description = "tar wrapper";
+  };
+})
diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix
index 88cf062f2a0f5..753777e941c9d 100644
--- a/pkgs/misc/bleeding-edge-fetch-infos.nix
+++ b/pkgs/misc/bleeding-edge-fetch-infos.nix
@@ -7,9 +7,9 @@
     url = http://mawercer.de/~nix/repos/cabal.tar.gz;
     sha256 = "2c370636ef30593325b1c01eed37eb0e993923acb6387724d97a5eed51b00887";
   };
-  getOptions = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/getOptions.tar.gz;
-    sha256 = "6475f2e5762cee2b8544d051c2b831ed5bd22a5711eca86fd6e0f0e95ac8b8b0";
+  getOptions = args: with args; fetchurl { # Thu Jul  9 23:31:53 CEST 2009
+    url = "http://mawercer.de/~nix/repos/getOptions-nrmtag1.tar.gz";
+    sha256 = "5ec39b43a58a507ed3652bc53d57d9b785a6fbb72a8824b951590e076c704589";
   };
   ghc_lambdavm = args: with args; fetchurl {
     url = http://mawercer.de/~nix/repos/ghc_lambdavm.tar.gz;
@@ -255,4 +255,8 @@
     url = "http://mawercer.de/~nix/repos/sqlalchemyMigrate-569.tar.gz";
     sha256 = "7775d9bf7e25a8270ac112d9b1d916a36691a73beb9a87a6473d005d3ee0f0bf";
   };
+  ghc_syb = args: with args; fetchurl { # Thu Jul  9 23:41:34 CEST 2009
+    url = "http://mawercer.de/~nix/repos/ghc_syb-876b121e73f1b5ca4b17b0c6908b27ba7efb0374.tar.gz";
+    sha256 = "325a19962e90dc5fb07845d2ac4df6e332061cda4b8950b95bcb782706ed3e31";
+  };
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f14aa24bed63e..25e22f42eb8bc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -38,6 +38,14 @@ rec {
     inherit cabal;
   };
 
+  bytestring = import ../development/libraries/haskell/bytestring {
+    inherit cabal;
+  };
+
+  networkBytestring = import ../development/libraries/haskell/network-bytestring {
+    inherit cabal bytestring network;
+  };
+
   cgi = import ../development/libraries/haskell/cgi {
     inherit cabal mtl network parsec xhtml;
   };
@@ -81,6 +89,10 @@ rec {
     inherit cabal mtl;
   };
 
+  getOptions = import ../development/libraries/haskell/get-options {
+    inherit cabal mtl; inherit (pkgs.bleedingEdgeRepos) sourceByName;
+  };
+
   ghcCore = import ../development/libraries/haskell/ghc-core {
     inherit cabal pcreLight hscolour;
   };
@@ -89,6 +101,10 @@ rec {
     inherit cabal;
   };
 
+  ghcSyb = import ../development/libraries/haskell/ghc-syb {
+    inherit cabal syb; inherit (pkgs.bleedingEdgeRepos) sourceByName;
+  };
+
   GLUT = import ../development/libraries/haskell/GLUT {
     inherit cabal OpenGL;
     glut = pkgs.freeglut;
@@ -268,6 +284,10 @@ rec {
     inherit cabal regexBase;
   };
 
+  syb = import ../development/libraries/haskell/syb {
+    inherit cabal;
+  };
+
   SDLImage = import ../development/libraries/haskell/SDL-image {
     inherit cabal SDL;
     inherit (pkgs) SDL_image;
@@ -464,6 +484,14 @@ rec {
     inherit cabal haskellSrcExts mtl uniplate hscolour;
   };
 
+  hslogger = import ../development/tools/haskell/hslogger {
+    inherit cabal mtl network time;
+  };
+
+  tar = import ../development/tools/haskell/tar {
+    inherit cabal binary;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };