* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=16094

pkgs/development/libraries/SDL/default.nix

@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, x11, libXrandr, openglSupport ? false, mesa ? null
+{ stdenv, fetchurl, x11, libXrandr, pkgconfig
+, openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
+, pulseaudioSupport ? true, pulseaudio ? null
 }:
 
 assert openglSupport -> mesa != null;
 assert alsaSupport -> alsaLib != null;
+assert pulseaudioSupport -> pulseaudio != null;
 
 stdenv.mkDerivation {
   name = "SDL-1.2.13";
@@ -13,14 +16,19 @@ stdenv.mkDerivation {
     sha256 = "0cp155296d6fy3w31jj481jxl9b43fkm01klyibnna8gsvqrvycl";
   };
   
-  propagatedBuildInputs = [x11 libXrandr];
-  
-  buildInputs =
+  # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
+  propagatedBuildInputs = [ x11 libXrandr ] ++
+    stdenv.lib.optional pulseaudioSupport pulseaudio;
+
+  buildInputs = [ pkgconfig ] ++
     stdenv.lib.optional openglSupport mesa ++
     stdenv.lib.optional alsaSupport alsaLib;
-    
+
+  # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
+  # we must arrange to add it to its RPATH; however, `patchelf' seems
+  # to fail at doing this, hence `--disable-pulseaudio-shared'.
   configureFlags = ''
-    --disable-x11-shared --disable-alsa-shared --enable-rpath
+    --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared
     ${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""}
   '';
 

pkgs/development/libraries/aterm/2.5.nix

@@ -15,6 +15,8 @@ stdenv.mkDerivation {
   
   doCheck = true;
 
+  dontDisableStatic = true; 
+
   meta = {
     homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
     license = "LGPL";

pkgs/development/libraries/botan/default.nix

@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.getAttr ["version"] "1.8.1" a; 
+  version = a.lib.attrByPath ["version"] "1.8.1" a; 
   buildInputs = with a; [
     perl
   ];

pkgs/development/libraries/chipmunk/default.nix

@@ -2,9 +2,9 @@ args :
 let 
   lib = args.lib;
   fetchurl = args.fetchurl;
-  FullDepEntry = args.FullDepEntry;
+  fullDepEntry = args.fullDepEntry;
 
-  version = lib.getAttr ["version"] "4.1.0" args; 
+  version = lib.attrByPath ["version"] "4.1.0" args; 
   buildInputs = with args; [
     cmake freeglut mesa 
     libX11 xproto inputproto libXi libXmu
@@ -22,11 +22,11 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
 
-  genMakefile = FullDepEntry ''
+  genMakefile = fullDepEntry ''
     cmake -D CMAKE_INSTALL_PREFIX=$out . 
   '' ["minInit" "addInputs" "doUnpack"];
 
-  demoInstall = FullDepEntry(''
+  demoInstall = fullDepEntry(''
     ensureDir $out/bin
     cp chipmunk_demos $out/bin
   '') ["doMakeInstall" "defEnsureDir"];

pkgs/development/libraries/cl-ppcre/default.nix

@@ -4,7 +4,7 @@ let
   fetchurl = args.fetchurl;
   simplyShare = args.simplyShare;
 
-  version = lib.getAttr ["version"] "2.0.0" args; 
+  version = lib.attrByPath ["version"] "2.0.0" args; 
   buildInputs = with args; [ ];
 in
 rec {

pkgs/development/libraries/ctl/default.nix

@@ -20,4 +20,6 @@ stdenv.mkDerivation {
       homepage = http://ampasctl.sourceforge.net;
       license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
   };
+
+  patches = [ ./patch.patch ];
 }

pkgs/development/libraries/ctl/patch.patch

@@ -0,0 +1,24 @@
+diff --git a/IlmCtl/CtlLex.cpp b/IlmCtl/CtlLex.cpp
+index e662d22..a47311a 100644
+--- a/IlmCtl/CtlLex.cpp
++++ b/IlmCtl/CtlLex.cpp
+@@ -57,6 +57,7 @@
+ #include <CtlLContext.h>
+ #include <iomanip>
+ #include <cassert>
++#include <stdlib.h>
+ 
+ 
+ #if 0
+diff --git a/IlmCtlSimd/CtlSimdReg.h b/IlmCtlSimd/CtlSimdReg.h
+index 6b000b2..8a39f7c 100644
+--- a/IlmCtlSimd/CtlSimdReg.h
++++ b/IlmCtlSimd/CtlSimdReg.h
+@@ -52,6 +52,7 @@
+ #include <typeinfo>
+ #include <CtlExc.h>
+ #include <Iex.h>
++#include <memory.h>
+ 
+ //-----------------------------------------------------------------------------
+ //

pkgs/development/libraries/dbus-glib/default.nix

@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "dbus-glib-0.74";
+  name = "dbus-glib-0.80";
   
   src = fetchurl {
     url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
-    sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78";
+    sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm";
   };
   
   buildInputs = [pkgconfig expat gettext];

pkgs/development/libraries/freeimage/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip}:
 stdenv.mkDerivation {
-  name = "freeimage-3.11.0";
+  name = "freeimage-3.12.0";
   src = fetchurl {
     url = mirror://sourceforge/freeimage/FreeImage3120.zip;
     sha256 = "1hvcmv8hnv3h24zcl324g3l0ww8aa8fkcfav2lrgs1kwzp5zqcd4";

pkgs/development/libraries/gtk-libs/2.16/gtk+/default.nix

@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.16.1";
+  name = "gtk+-2.16.2";
   
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.16/${name}.tar.bz2";
-    sha256 = "0l3dfznv07nmzavqp0shr5qf66alb6xyzmiq728hgygmnayky7rg";
+    sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3";
   };
   
   buildInputs = [ pkgconfig perl jasper ];

pkgs/development/libraries/haskell/HDBC/HDBC-1.1.4.nix

@@ -1,10 +0,0 @@
-{cabal}:
-
-cabal.mkDerivation (self : {
-  pname = "HDBC";
-  version = "1.1.4";
-  sha256 = "de03020874b532f7aa734f093caf0709e7d33d0d64c59ce0a003b2269fc85597";
-  meta = {
-    description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases";
-  };
-})

pkgs/development/libraries/haskell/HDBC/HDBC-postgresql-1.1.4.0.nix

@@ -1,12 +0,0 @@
-{cabal, HDBC, postgresql}:
-
-cabal.mkDerivation (self : {
-  pname = "HDBC-postgresql";
-  version = "1.1.4.0";
-  sha256 = "039eae03693330fee0e4083e22d502f94865969b243744a939786f598aec34ad";
-  meta = {
-    description = "This package provides a PostgreSQL driver for HDBC";
-  };
-  propagatedBuildInputs = [HDBC postgresql];
-})
-

pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix

@@ -0,0 +1,12 @@
+{cabal, HDBC, postgresql, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "HDBC-postgresql";
+  version = "2.1.0.0";
+  sha256 = "424b491766410df73f2df87a5cd4b5f4549850cc53a2f1c937b546ff1ef1562b";
+  propagatedBuildInputs = [HDBC parsec postgresql];
+  meta = {
+    description = "This package provides a PostgreSQL driver for HDBC";
+  };
+})
+

pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix

@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "HDBC-sqlite3";
-  version = "1.1.4.0";
-  sha256 = "328fed8d4cdba4311efd50d9d60591a81481317ddba10c58fbaa2ec7f418f788";
+  version = "2.1.0.0";
+  sha256 = "a95f28fadd67ba1593cf75774308b7cfdde4a78ee5cba0a6aeb6c18723d8d67b";
+  propagatedBuildInputs = [HDBC sqlite];
   meta = {
     description = "This is the Sqlite v3 driver for HDBC, the generic database access system for Haskell";
   };
-  propagatedBuildInputs = [HDBC sqlite];
 })
 

pkgs/development/libraries/haskell/HDBC/HDBC.nix

@@ -0,0 +1,12 @@
+{cabal, HUnit, QuickCheck, mtl, time, utf8String, convertible, testpack}:
+
+cabal.mkDerivation (self : {
+  pname = "HDBC";
+  version = "2.1.1";
+  sha256 = "9a3ab307c006fb9c22089a15d190339c45de0a32e700f2d9eda70423e719197c";
+  propagatedBuildInputs =
+    [HUnit QuickCheck mtl time utf8String convertible testpack];
+  meta = {
+    description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases";
+  };
+})

pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix

@@ -0,0 +1,12 @@
+{cabal, Shellac, haskeline}:
+
+cabal.mkDerivation (self : {
+  pname = "Shellac-haskeline";
+  version = "0.2";
+  sha256 = "e3024b1915efd9841be9f405503f26c52524e7ea2a9c630ad651a9986e5329e0";
+  propagatedBuildInputs = [Shellac haskeline];
+  meta = {
+    description = "Haskeline backend module for Shellac";
+  };
+})  
+

pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix

@@ -0,0 +1,12 @@
+{cabal, Shellac, readline}:
+
+cabal.mkDerivation (self : {
+  pname = "Shellac-readline";
+  version = "0.9";
+  sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878";
+  propagatedBuildInputs = [Shellac readline];
+  meta = {
+    description = "Readline backend module for Shellac";
+  };
+})  
+

pkgs/development/libraries/haskell/Shellac/Shellac.nix

@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "Shellac";
+  version = "0.9.5";
+  sha256 = "a8b07918be23b7e7c3114aed7d929f95ace37fbacd82f185358f05f337f09c70";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "A framework for creating shell environments";
+  };
+})  
+

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

@@ -0,0 +1,12 @@
+{cabal, mtl, time}:
+
+cabal.mkDerivation (self : {
+  pname = "convertible";
+  version = "1.0.5";
+  sha256 = "caf75727a35cf249690f3da60fce770642c8a1fad6080f3ba57e924fbe3c9465";
+  propagatedBuildInputs = [mtl time];
+  meta = {
+    description = "Typeclasses and instances for converting between types";
+  };
+})  
+

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

@@ -0,0 +1,12 @@
+{cabal, zlib}:
+
+cabal.mkDerivation (self : {
+  pname = "digest";
+  version = "0.0.0.5";
+  sha256 = "dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd";
+  propagatedBuildInputs = [zlib];
+  meta = {
+    description = "Various cryptographic hashes for bytestrings: CRC32 and Adler32 for now";
+  };
+})  
+

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

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "dotgen";
+  version = "0.3";
+  sha256 = "1c486ffa782c4a46e66df12f5acf776a808b654d96fe0d0071d5c41111b1b7ed";
+  meta = {
+    description = "A simple interface for building .dot graph files";
+  };
+})  
+

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

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "emgm";
+  version = "0.3.1";
+  sha256 = "956923ec4d51f111ca6091ebccf75a1f6b99d7a173ea673cbb4787bf08f497a8";
+  meta = {
+    description = "Extensible and Modular Generics for the Masses";
+  };
+})  
+

pkgs/development/libraries/haskell/haskell-platform/default.nix

@@ -1,16 +1,16 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
+{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline,
  haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
  stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
-  version = "2009.2.0";
+  version = "2009.2.0.1";
   src = fetchurl {
     url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "d2b8cad09128ca6ea62ddf0f56dd7874603623aae243411a74d6d1c5be38d38b";
+    sha256 = "33a828ed6cd1e6cc32cfec3fd55e6ab4d8026bd7451bab65ec0873880c0f11c5";
   };
   propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
+    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
     haskellSrc html parallel regexBase regexCompat regexPosix
     stm time xhtml zlib cabalInstall alex happy ghc
   ];

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

@@ -0,0 +1,12 @@
+{cabal, mtl, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "ivor";
+  version = "0.1.8";
+  sha256 = "e51ad07c78ea0cad6fce9253012258dbf7c740198792aa4a446e1f0269a9186d";
+  propagatedBuildInputs = [mtl parsec];
+  meta = {
+    description = "Theorem proving library based on dependent type theory";
+  };
+})  
+

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "multirec";
-  version = "0.2";
-  sha256 = "66f748245020437ad30dbc25e2decae7d49c6d968c014b316c0961539892083c";
+  version = "0.4";
+  sha256 = "ad7a6ae90e1880b3fd79686ce8012e531b738f8f1d10ba836550fc91cfe3695e";
   meta = {
     description = "Generic programming with systems of recursive datatypes";
   };

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "network";
-  version = "2.2.1"; # Haskell Platform 2009.0.0
-  sha256 = "111e4963a0a979570993e79511a778b267ef58df35320d1ddda61a869259b63c";
+  version = "2.2.1.1"; # Haskell Platform 2009.2.0.1
+  sha256 = "2b1fb2a16ed740636871662f2e38dffd9b7c13c61e28d887a1c334da3867da9d";
   propagatedBuildInputs = [parsec];
   meta = {
     description = "Networking-related facilities";

pkgs/development/libraries/haskell/non-negative/default.nix

@@ -0,0 +1,12 @@
+{cabal, QuickCheck}:
+
+cabal.mkDerivation (self : {
+  pname = "non-negative";
+  version = "0.0.4";
+  sha256 = "0b82b7be086c8d4e493d606098d82c2e5d943fe76d18a5eb6836c449ba19fc6f";
+  propagatedBuildInputs = [QuickCheck];
+  meta = {
+    description = "Non-negative numbers";
+  };
+})
+

pkgs/development/libraries/haskell/numeric-prelude/default.nix

@@ -0,0 +1,12 @@
+{cabal, HUnit, QuickCheck, parsec, nonNegative, utilityHt}:
+
+cabal.mkDerivation (self : {
+  pname = "numeric-prelude";
+  version = "0.1";
+  sha256 = "01de33ea483808704f6d2c635763fcbff3abe12db8035c6640124eb8486b6efb";
+  propagatedBuildInputs = [HUnit QuickCheck parsec nonNegative utilityHt];
+  meta = {
+    description = "An experimental alternative hierarchy of numeric type classes";
+  };
+})
+

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

@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive}:
+
+cabal.mkDerivation (self : {
+  pname = "pandoc";
+  version = "1.2";
+  sha256 = "e922c8f4765a8d105abf30dbe21a73961357929cd2fb8dfd323f0f62ca0723b4";
+  propagatedBuildInputs = [mtl network parsec utf8String xhtml zipArchive];
+  meta = {
+    description = "Conversion between markup formats";
+  };
+})  
+

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

@@ -1,10 +1,10 @@
-{ cabal, readline } :
+{ cabal, readline, ncurses } :
 
 cabal.mkDerivation (self : {
   pname = "readline";
   version = "1.0.1.0";
   sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d";
-  propagatedBuildInputs = [ readline ];
+  propagatedBuildInputs = [ readline ncurses ];
   # experimentally link with ncursesw because ghci can't interpret ld scripts,
   # and ncurses sometimes seems to be a script pointing to ncursesw
   postConfigure = ''

pkgs/development/libraries/haskell/storable-complex/default.nix

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "storable-complex";
+  version = "0.2";
+  sha256 = "4e0e48e641d415b8e549ca3db84468ae18fc74aa3e9848674c48a9024635b8bb";
+  meta = {
+    description = "Storable instance for Complex";
+  };
+})
+

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

@@ -0,0 +1,11 @@
+{cabal, ncurses}:
+
+cabal.mkDerivation (self : {
+  pname = "terminfo";
+  version = "0.3.0.2";
+  sha256 = "2303d934fcec0f6413f15887f7f42e8e2e5b27812534a929bf585bfa6f3a9229";
+  propagatedBuildInputs = [ncurses];
+  meta = {
+    description = "Haskell bindings for the terminfo library";
+  };
+})

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

@@ -0,0 +1,12 @@
+{cabal, HUnit, QuickCheck, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "testpack";
+  version = "1.0.2";
+  sha256 = "ff3d24a755aeeb765d5e93aa0189d0d67ac96b2d84e27a29609eb4738a6cdabc";
+  propagatedBuildInputs = [HUnit QuickCheck mtl];
+  meta = {
+    description = "Test Utility Pack for HUnit and QuickCheck";
+  };
+})  
+

pkgs/development/libraries/haskell/time/1.1.3.nix

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "time";
+  version = "1.1.3";
+  sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b";
+  meta = {
+    description = "A time library";
+  };
+})  
+

pkgs/development/libraries/haskell/utility-ht/default.nix

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "utility-ht";
+  version = "0.0.5.1";
+  sha256 = "f15fd1450b31f002e6d4fe3720cff7c899f23f8a68b890ea3854e68e596c97cb";
+  meta = {
+    description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
+  };
+})
+

pkgs/development/libraries/haskell/uu-parsinglib/default.nix

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "uu-parsinglib";
+  version = "2.2.0";
+  sha256 = "f66b16d112d8a013eaf14823d2f3d228b476dfd117558a97a949a29961db5290";
+  meta = {
+    description = "New version of the Utrecht University parser combinator library";
+  };
+})  
+

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "vacuum";
-  version = "0.0.91";
-  sha256 = "9240ec35b39d60928a73469893adf1d2aa742b9a781dbc6dcdaa54e96d9bf1af";
+  version = "0.0.94";
+  sha256 = "7056dfa38a9f579ee897d2980938fd484ddfa93c472014ad7ea5a5cd9100bfad";
   propagatedBuildInputs = [ghcPaths haskellSrcMeta];
   meta = {
     description = "Extract graph representations of ghc heap values";

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

@@ -1,13 +1,11 @@
-{cabal}:
+{cabal, utf8String, terminfo}:
 
 cabal.mkDerivation (self : {
   pname = "vty";
-  version = "3.0.0";
-  sha256 = "44ae53d06b8b45c14cd3861e860a38730ed9995ed56b1b3d9aba6641771f1947";
+  version = "3.1.8.4";
+  sha256 = "9a006e77bb4f032613e059eea7bc4d92cbc7943449fb9c7269a061ddd9b3d82b";
+  propagatedBuildInputs = [utf8String terminfo];
   meta = {
-    description = "vty is a *very* simplistic library in the niche of ncurses";
+    description = "A simple terminal access library";
   };
-  preConfigure = ''
-    sed -i 's|^Build-Depends:.*$|&, bytestring, containers|' ${self.pname}.cabal
-  '';
 })

pkgs/development/libraries/haskell/zip-archive/default.nix

@@ -0,0 +1,12 @@
+{cabal, binary, mtl, utf8String, zlib, digest}:
+
+cabal.mkDerivation (self : {
+  pname = "zip-archive";
+  version = "0.1.1.3";
+  sha256 = "2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a";
+  propagatedBuildInputs = [binary mtl utf8String zlib digest];
+  meta = {
+    description = "Library for creating and modifying zip archives";
+  };
+})  
+

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

@@ -0,0 +1,12 @@
+{cabal, multirec}:
+
+cabal.mkDerivation (self : {
+  pname = "zipper";
+  version = "0.3";
+  sha256 = "3f6cc0ea69734d0523f1bf74d14953f88a196e728f89a7cc91f394d9e0c13c15";
+  propagatedBuildInputs = [multirec];
+  meta = {
+    description = "Generic zipper for systems of recursive datatypes";
+  };
+})  
+

pkgs/development/libraries/libcv/default.nix

@@ -2,9 +2,9 @@ args :
 let 
   lib = args.lib;
   fetchurl = args.fetchurl;
-  FullDepEntry = args.FullDepEntry;
+  fullDepEntry = args.fullDepEntry;
 
-  version = lib.getAttr ["version"] "" args; 
+  version = lib.attrByPath ["version"] "" args; 
   buildInputs = with args; [
     libtiff libpng libjpeg pkgconfig 
     gtk glib
@@ -22,7 +22,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
 
-  postInstall = FullDepEntry (''
+  postInstall = fullDepEntry (''
     ln -s $out/include/opencv/* $out/include
   '') ["doMakeInstall" "minInit"];
       

pkgs/development/libraries/libffcall/default.nix

@@ -0,0 +1,38 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.attrByPath ["version"] "2009-05-27" a; 
+  buildInputs = with a; [
+    
+  ];
+in
+rec {
+  src = a.fetchcvs {
+    cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall";
+    module = "ffcall";
+    date = version;
+    sha256 = "91bcb5a20c85a9ccab45886aae8fdbbcf1f20f995ef898e8bdd2964448daf724";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  doConfigure = a.fullDepEntry (''
+    for i in ./configure */configure; do
+      cwd="$PWD"
+      cd "$(dirname "$i")"; 
+      ( test -f Makefile && make distclean ) || true
+      ./configure --prefix=$out
+      cd "$cwd"
+    done
+  '') a.doConfigure.deps;
+
+  name = "libffcall-" + version;
+  meta = {
+    description = "Foreign fuction call library";
+  };
+}

pkgs/development/libraries/libproxy/default.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libproxy-0.2.3";
+  src = fetchurl {
+    url = http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz;
+    sha256 = "16ikq42ffrfd60j57r0l488r8zgkyxcn7l69gkijjzalndhd3pjr";
+  };
+}

pkgs/development/libraries/libunistring/default.nix

@@ -0,0 +1,41 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "libunistring-0.9";
+
+  src = fetchurl {
+    url = "mirror://gnu/libunistring/${name}.tar.gz";
+    sha256 = "0j5f9nd6i5irvc9gk4ffgx3kgii3izhbm9adzv6svvkzwfiqsyrx";
+  };
+
+  doCheck = true;
+
+  meta = {
+    homepage = http://www.gnu.org/software/libunistring/;
+
+    description = "GNU Libunistring, a Unicode string library";
+
+    longDescription = ''
+      This library provides functions for manipulating Unicode strings
+      and for manipulating C strings according to the Unicode
+      standard.
+
+      GNU libunistring is for you if your application involves
+      non-trivial text processing, such as upper/lower case
+      conversions, line breaking, operations on words, or more
+      advanced analysis of text.  Text provided by the user can, in
+      general, contain characters of all kinds of scripts.  The text
+      processing functions provided by this library handle all scripts
+      and all languages.
+
+      libunistring is for you if your application already uses the ISO
+      C / POSIX <ctype.h>, <wctype.h> functions and the text it
+      operates on is provided by the user and can be in any language.
+
+      libunistring is also for you if your application uses Unicode
+      strings as internal in-memory representation.
+    '';
+
+    license = "LGPLv3+";
+  };
+}

pkgs/development/libraries/libvncserver/default.nix

@@ -3,7 +3,7 @@ let
   lib = args.lib;
   fetchurl = args.fetchurl;
 
-  version = lib.getAttr ["version"] "0.9.1" args; 
+  version = lib.attrByPath ["version"] "0.9.1" args; 
   buildInputs = with args; [
     libtool libjpeg openssl libX11 libXdamage xproto damageproto
     xextproto libXext fixesproto libXfixes xineramaproto libXinerama

pkgs/development/libraries/libxklavier/default.nix

@@ -1,15 +1,15 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "libxklavier-3.4";
+  name = "libxklavier-3.9";
 
   src = fetchurl {
-    url = "mirror://sf/gswitchit/${name}.tar.gz";
-    sha256 = "07pq74ygmnr3vgfp86dbjnqsp3v67fww6d3a1vqbif9wzbk70195";
+    url = "mirror://sf/gswitchit/${name}.tar.bz2";
+    sha256 = "462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554";
   };
 
 # TODO: enable xmodmap support, needs xmodmap DB
-  propagatedBuildInputs = [libX11 xkeyboard_config libxml2 libICE glib libxkbfile];
+  propagatedBuildInputs = [libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes];
   
   buildInputs = [pkgconfig];
   

pkgs/development/libraries/mesa/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}:
 
-if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" then
+if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.system != "i686-darwin" then
   throw "unsupported platform for Mesa"
 else
 

pkgs/development/libraries/muparser/default.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+	name = "muparser-1.30";
+	src = fetchurl {
+		url = mirror://sourceforge/muparser/muparser_v130.tar.gz;
+		sha256 = "164wak2sva6z9vq3anrciz1npyk2x3wqkz6xwp9ld3gmdqbdn8s4";
+	};
+}

pkgs/development/libraries/ode/default.nix

@@ -3,7 +3,7 @@ let
   lib = args.lib;
   fetchurl = args.fetchurl;
 
-  version = lib.getAttr ["version"] "0.10.1" args; 
+  version = lib.attrByPath ["version"] "0.10.1" args; 
   buildInputs = with args; [
     
   ];

pkgs/development/libraries/openexr/default.nix

@@ -12,4 +12,5 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
   propagatedBuildInputs = [pkgconfig zlib ilmbase];
   configureFlags = "--enable-imfexamples";
+  patches = [ ./stringh.patch ];
 }

pkgs/development/libraries/openexr/stringh.patch

@@ -0,0 +1,25 @@
+diff --git a/exrenvmap/main.cpp b/exrenvmap/main.cpp
+index c5afcc5..5e993b3 100644
+--- a/exrenvmap/main.cpp
++++ b/exrenvmap/main.cpp
+@@ -45,6 +45,7 @@
+ #include <iostream>
+ #include <exception>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ using namespace Imf;
+ using namespace std;
+diff --git a/exrmaketiled/main.cpp b/exrmaketiled/main.cpp
+index 5ce4e95..f93ec08 100644
+--- a/exrmaketiled/main.cpp
++++ b/exrmaketiled/main.cpp
+@@ -44,7 +44,7 @@
+ 
+ #include <iostream>
+ #include <exception>
+-#include <string>
++#include <string.h>
+ #include <stdlib.h>
+ 
+ using namespace Imf;

pkgs/development/libraries/openmpi/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "openmpi-1.3.2";
+  src = fetchurl {
+    url = http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-1.3.2.tar.gz ;
+    sha256 = "1n7c0y4nidm0ha23ic7f872qh3296rh2177r1wqqs83k2ma7xxxb";
+  };
+}
+

pkgs/development/libraries/poppler/default.nix

@@ -5,11 +5,11 @@
 assert qt4Support -> (qt4 != null);
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.10.4";
+  name = "poppler-0.10.6";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "15c53cn8ljhas0fbirp9s8sbgmaxpzg697c48zsdnz8zwm797gs1";
+    sha256 = "bcd78d674c4166af069afdb27af810c012e13cfd2b7b21f9dce63dd3f62bded1";
   };
 
   buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]

pkgs/development/libraries/qt-4/setup-hook.sh

@@ -1,7 +1,9 @@
 export QTDIR=@out@
 
-if [ -n $qt4BadIncludes ]; then
-    for d in @out@/include/*; do
-	export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d";
-    done;
+if [ -n "$includeAllQtDirs" ]; then
+  # This helps for g++, but not for moc. And no qt4 package should expect
+  # having all qt4 header files dirs into -I.
+  for d in @out@/include/*; do
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
+  done
 fi

pkgs/development/libraries/science/math/atlas/default.nix

@@ -1,16 +1,17 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "atlas-3.9.9";
+  name = "atlas-3.9.11";
   src = fetchurl {
-    url = http://kent.dl.sourceforge.net/sourceforge/math-atlas/atlas3.9.9.tar.bz2;
-    sha256 = "0apbiqr0hlb38mrnlij0szsraxvxqfqainmp59xqj94pndx5s3yk";
+    url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
+    sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
   };
 
   # configure outside of the source directory
   preConfigure = '' mkdir build; cd build; configureScript=../configure; '';
 
-  NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
+  # the manual says you should pass -fPIC as configure arg .. It works
+  configureFlags = "-Fa alg -fPIC";
 
   buildInputs = [gfortran];
 

pkgs/development/libraries/tk/8.4.16.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb";
   };
   postInstall = ''
-    echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish
+    echo -e '#! /bin/sh \n $( readlink -f $( type -tP wish${builtins.substring 0 3 version}) ) "$@"' >$out/bin/wish
     chmod a+x $out/bin/wish
   ''; 
   configureFlags="--with-tcl=${tcl}/lib";

pkgs/development/libraries/vxl/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
 stdenv.mkDerivation {
-  name = "vxl-1.11.0";
+  name = "vxl-1.12.0";
 
   src = fetchurl {
     url = mirror://sourceforge/vxl/vxl-1.12.0.zip;

pkgs/development/libraries/webkit/default.nix

@@ -1,34 +1,45 @@
 args : with args; 
-let version = lib.getAttr ["version"] "r34824" args; in
+let version = lib.attrByPath ["version"] "r44341" args; in
 rec {
   src = fetchurl {
     url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2";
-    sha256 = "10h295niz1np0rfjqchvjda8kdxf9z0qrk2r3x8xbrbva1y6dfn6";
+    sha256 = "17byp4v47xk6xdxq6adpf0b9vswasrhj4f5pw0y2z80lgd1sxcly";
   };
 
   buildInputs = [gtk atk cairo curl fontconfig freetype
     gettext libjpeg libpng libtiff libxml2 libxslt pango
     sqlite icu gperf bison flex autoconf automake libtool 
-    perl intltool pkgconfig];
+    perl intltool pkgconfig libsoup gtkdoc libXt libproxy
+    enchant gstreamer gstPluginsBase gstFfmpeg
+    ];
 
   configureCommand = "./autogen.sh ";
   configureFlags = [];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
+  phaseNames = ["setVars" "paranoidFixComments" "doConfigure" (doPatchShebangs ".") 
+    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
 
-  doReplaceUsrBin = FullDepEntry (''
+  setVars = fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
+  '') ["minInit"];
+
+  doReplaceUsrBin = fullDepEntry (''
     for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
         sed -e 's@/usr/bin/gcc@gcc@' -i $i
     done
   '') ["minInit" "doUnpack"];
 
-  doAddPrograms = FullDepEntry (''
+  doAddPrograms = fullDepEntry (''
     for i in Programs/.libs/*; do 
         cp $i $out/bin/webkit-program-$(basename $i)
     done
   '') ["minInit" "doMake" "defEnsureDir"];
       
+  paranoidFixComments = fullDepEntry (''
+    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
+  '') ["minInit" "doUnpack"];
+
   name = "webkit-" + version;
   meta = {
     description = "WebKit - a fast and correct HTML renderer";

pkgs/development/libraries/wxGTK-2.8/default.nix

@@ -34,10 +34,7 @@ stdenv.mkDerivation {
   SEARCH_INCLUDE =
     "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
 
-  SEARCH_LIB = if (stdenv.system == "x86_64-linux") then
-    "${mesa}/lib64"
-    else 
-    "${mesa}/lib";
+  SEARCH_LIB = "${mesa}/lib";
 
   # Work around a bug in configure.
   NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";