* Sync with the trunk.

svn path=/nixpkgs/branches/cve-2010-3856/; revision=24921

12 files changed, 243 insertions, 7 deletions

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
new file mode 100644
index 0000000000000..1669d083f226b
--- /dev/null
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -0,0 +1,59 @@
+x@{builderDefsPackage
+  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
+  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
+  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="allegro";
+    version="4.4.0.1";
+    name="${baseName}-${version}";
+    project="alleg";
+    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
+    hash="0qgkmazr07lmnbj6h6yk10vmcm15gafcwy5jn7xpwy7bahzraiz0";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doCmake" "doMakeInstall"];
+
+  doCmake = a.fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
+    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
+  '') ["minInit" "doUnpack" "addInputs"];
+      
+  makeFlags = [
+  ];
+
+  meta = {
+    description = "A game programming library";
+    license = "free-noncopyleft"; # giftware
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://sourceforge.net/projects/alleg/files/";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
new file mode 100644
index 0000000000000..6bd3dd41de747
--- /dev/null
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -0,0 +1,57 @@
+x@{builderDefsPackage
+  , texinfo, allegro, perl
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="cgui";
+    version="2.0.3";
+    name="${baseName}-${version}";
+    project="${baseName}";
+    url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz";
+    hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["genMakefile" "doMakeInstall"];
+
+  genMakefile = a.fullDepEntry (''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    sh fix.sh unix
+  '') ["minInit" "doUnpack" "addInputs"];
+      
+  makeFlags = [
+    "SYSTEM_DIR=$out"
+  ];
+
+  meta = {
+    description = "A multiplatform basic GUI library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://sourceforge.net/projects/cgui/files/";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix
new file mode 100644
index 0000000000000..6e5fdb9b787e9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Chart/default.nix
@@ -0,0 +1,15 @@
+{cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "Chart";
+  version = "0.13.1";
+  sha256 = "1gh8qw8xil543wssflhpjrgnig4v79vi7xizrm93a93i4n84npd5";
+  propagatedBuildInputs =
+    [cairo colour dataAccessor dataAccessorTemplate gtk mtl];
+  meta = {
+    description = "A library for generating 2D Charts and Plots";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 0b1cac4076f7a..ce6b5d5e2dc5a 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -1,13 +1,17 @@
 {cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms,
- mwcRandom, statistics}:
+ mwcRandom, statistics, Chart, dataAccessor}:
 
 cabal.mkDerivation (self : {
   pname = "criterion";
   version = "0.5.0.5";
   sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn";
 
-  propagatedBuildInputs =
-    [deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics];
+  propagatedBuildInputs = [
+    deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics
+    Chart dataAccessor
+  ];
+
+  configureFlags = "-fchart";
 
   meta = {
     homepage = "http://bitbucket.org/bos/criterion";
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
new file mode 100644
index 0000000000000..ff985fbfef8d0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -0,0 +1,14 @@
+{cabal, dataAccessor, utilityHt}:
+
+cabal.mkDerivation (self : {
+  pname = "data-accessor-template";
+  version = "0.2.1.5";
+  sha256 = "0fvf1cacvqzyl9x88h7fa0d6p94qhkvf177a84g036qjxn0khyja";
+  propagatedBuildInputs = [dataAccessor utilityHt];
+  meta = {
+    description = "Utilities for accessing and manipulating the fields of records";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
new file mode 100644
index 0000000000000..99e842444607e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -0,0 +1,14 @@
+{cabal, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "data-accessor";
+  version = "0.2.1.4";
+  sha256 = "1fnfbcw1fzas2sbk9yhwd05ncvgqfy47hi9xh0ygsqilx7nwkdxv";
+  propagatedBuildInputs = [transformers];
+  meta = {
+    description = "Utilities for accessing and manipulating the fields of records";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix
new file mode 100644
index 0000000000000..3354a5873d0b3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/multiplate/default.nix
@@ -0,0 +1,14 @@
+{cabal, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "multiplate";
+  version = "0.0.1";
+  sha256 = "06bdj0r83arxxl6vqif9dmna140qcgvjizcyhvyqymsid605hrp4";
+  propagatedBuildInputs = [transformers];
+  meta = {
+    description = "Lightweight generic library for mutually recursive datatypes";
+    license = "MIT";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix
index 3253e58e7c21e..904e29beae9b4 100644
--- a/pkgs/development/libraries/qt-4.x/4.6/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.6/default.nix
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
new file mode 100644
index 0000000000000..aae678688848b
--- /dev/null
+++ b/pkgs/development/libraries/rlog/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "rlog-1.4";
+
+  src = fetchurl {
+    url = "http://rlog.googlecode.com/files/rlog-1.4.tar.gz";
+    sha256 = "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59";
+  };
+
+  meta = {
+    homepage = http://www.arg0.net/rlog;
+    description = "A C++ logging library used in encfs";
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/3.6.x.nix b/pkgs/development/libraries/sqlite/3.6.x.nix
index f700b862246bd..6a1c02dede1a5 100644
--- a/pkgs/development/libraries/sqlite/3.6.x.nix
+++ b/pkgs/development/libraries/sqlite/3.6.x.nix
@@ -3,11 +3,11 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.6.23";
+  name = "sqlite-3.6.23.1";
 
   src = fetchurl {
-    url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz";
-    sha256 = "a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae";
+    url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz";
+    sha256 = "0n1maahlqxk7p6kmsv0v2afy6qbv15n85mgkr4ylbf3ghcjdg06h";
   };
 
   buildInputs = [readline ncurses];
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
new file mode 100644
index 0000000000000..38cde3bfd7071
--- /dev/null
+++ b/pkgs/development/libraries/szip/default.nix
@@ -0,0 +1,9 @@
+{ stdenv, fetchurl }:
+    
+stdenv.mkDerivation {
+    name = "szip-2.1";
+    src = fetchurl {
+        url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
+        sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z";
+    };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
new file mode 100644
index 0000000000000..9e60f1ce8ba15
--- /dev/null
+++ b/pkgs/development/libraries/v8/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchsvn, python, scons, makeWrapper }:
+
+let
+  system = stdenv.system;
+  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; 
+in
+assert system == "i686-linux" || system == "x86_64-linux";
+stdenv.mkDerivation rec {
+    name = "v8-r${toString src.rev}";
+    src = fetchsvn {
+      url = http://v8.googlecode.com/svn/trunk ;
+      sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb";
+      rev = 5865;
+    };
+    
+    buildInputs = [python scons makeWrapper];
+    
+    buildPhase = ''
+      export CXX=`type -p g++`
+      scons snapshot=on importenv=PATH arch=${arch}
+      scons snapshot=on library=shared importenv=PATH arch=${arch}
+      scons sample=shell snapshot=on importenv=PATH arch=${arch} 
+    '';
+    
+    installPhase = ''
+      ensureDir $out/bin
+      ensureDir $out/lib
+      
+      cp -v libv8.* $out/lib
+      cp -v shell $out/bin/v8-shell
+      cp -vR include $out/
+      wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib  
+     
+    '';
+}