* Sync with the trunk.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18122

pkgs/development/interpreters/python/2.6/default.nix

@@ -19,6 +19,9 @@ with stdenv.lib;
 
 let
 
+  majorVersion = "2.6";
+  version = "${majorVersion}.4";
+
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
     [bzip2]
@@ -38,11 +41,11 @@ let
 in
 
 stdenv.mkDerivation ( {
-  name = "python-2.6.3";
+  name = "python-${version}";
 
   src = fetchurl {
-    url = http://www.python.org/ftp/python/2.6.3/Python-2.6.3.tar.bz2;
-    sha256 = "096wxhibhss3clgcj5n3xx5wmdsqmywk3h3bp68sicp7sy4y6rs3";
+    url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
+    sha256 = "dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89";
   };
 
   patches = [
@@ -53,7 +56,7 @@ stdenv.mkDerivation ( {
   inherit buildInputs;
   C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
   LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-  configureFlags = ''${if stdenv.isDarwin then "" else " --enable-shared"} --with-wctype-functions'';
+  configureFlags = ''${if stdenv.isDarwin then "" else " --enable-shared"} --with-threads --enable-unicode --with-wctype-functions'';
 
   preConfigure = ''
     # Purity.
@@ -67,7 +70,7 @@ stdenv.mkDerivation ( {
   setupHook = ./setup-hook.sh;
 
   postInstall = ''
-    rm -rf $out/lib/python2.6/test
+    rm -rf "$out/lib/python${majorVersion}/test"
   '';
 
   passthru = {
@@ -77,7 +80,7 @@ stdenv.mkDerivation ( {
     readlineSupport = readline != null;
     opensslSupport = openssl != null;
     tkSupport = (tk != null) && (tcl != null);
-    libPrefix = "python2.6";
+    libPrefix = "python${majorVersion}";
   };
 
   meta = {

pkgs/development/libraries/java/jetty-util/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "jetty-util-6.1.16";
+  src = fetchurl {
+    url = http://repository.codehaus.org/org/mortbay/jetty/jetty-util/6.1.16/jetty-util-6.1.16.jar;
+    sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq";
+  };
+  buildCommand = ''
+    ensureDir $out/share/java
+    cp $src $out/share/java/$name.jar
+  '';
+}

pkgs/development/libraries/java/smack/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "smack-3_1_0";
+  name = "smack-3_0_4";
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_1_0.tar.gz;
-    sha256 = "02kn3i7py6ilnchz0yn4v2g0sh8msxcw61kankqrz2a65852i28i";
+    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_0_4.tar.gz;
+    sha256 = "075nn7vwfjr2a9j6ycikkbssxhai82vpvll9123r83rar3ds3li6";
   };  
 }

pkgs/development/libraries/redland/1.0.9.nix

@@ -1,7 +1,7 @@
 args: with args;
 
 let name = "redland-${version}";
-in 
+in
 
 stdenv.mkDerivation {
   inherit name;
@@ -10,15 +10,24 @@ stdenv.mkDerivation {
     url = "mirror://sf/librdf/${name}.tar.gz";
     sha256 = "aa90ded84f5dd4cc2330bf79d139e00ceb93c6a9b94d17e1a93449ad579e1524";
   };
-  
+
   buildInputs = [pkgconfig];
-  
+
   propagatedBuildInputs = [
     bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
     librdf_raptor librdf_rasqal
   ];
-    
+
   configureFlags = "--with-threads --with-bdb=${bdb}";
-  
-  patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
+
+  patchPhase =
+  ''
+    sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl
+
+    # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API
+    # that collides with a symbol of the same name in sqlite 3.6.19.
+    # This is a quick fix for the problem. A real solution needs to be
+    # implemented upstream, though.
+    find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \;
+  '';
 }

pkgs/development/libraries/sqlite/default.nix

@@ -1,21 +1,22 @@
-{stdenv, fetchurl, readline, static ? false}:
+{stdenv, fetchurl, readline, tcl, static ? false}:
 
 stdenv.mkDerivation rec {
-  name = "sqlite-3.6.16";
+  name = "sqlite-3.6.19";
 
   # Note: don't use the "amalgamation" source release, since it
   # doesn't install sqlite3.pc.
   src = fetchurl {
     url = "http://www.sqlite.org/${name}.tar.gz";
-    sha256 = "1kadzd5c82x3i7vd0cfqxc3r8a2smc04fhsxpl07jxjlva4khvqc";
+    sha256 = "7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003";
   };
 
-  buildInputs = [readline];
+  buildInputs = [readline tcl];
 
   configureFlags = ''
+    CFLAGS=-O3
     --enable-load-extension
     ${if static then "--disable-shared --enable-static" else ""}
-    --disable-amalgamation
+    --enable-amalgamation
     --enable-threadsafe
     --disable-cross-thread-connections
     --disable-tcl

pkgs/development/tools/documentation/doxygen/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, graphviz, perl, flex, bison, gnumake, libX11, libXext, qt}:
 
 stdenv.mkDerivation rec {
-  name = "doxygen-1.5.8";
+  name = "doxygen-1.6.1";
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "1y2gyijhknam51jyh5ja2z5hlj0mr7r328rrwf27g7ljgsphlm01";
+    sha256 = "1lrrsljidil1860a8528qy3hiif5y47i89n1x1zhyjm1abqfsnjc";
   };
 
   patches = [ ./tmake.patch ];

pkgs/development/tools/ocaml/camlp5/default.nix

@@ -0,0 +1,35 @@
+{stdenv, fetchurl, ocaml, transitional ? false}:
+
+let
+  pname = "camlp5";
+  version = "5.12";
+  webpage = http://pauillac.inria.fr/~ddr/camlp5/;
+in
+
+stdenv.mkDerivation {
+
+  name = "${pname}${if transitional then "_transitional" else ""}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/distrib/src/${pname}-${version}.tgz";
+    sha256 = "985a5e373ea75f89667e71bc857c868c395769fce664cba88aa76f93b0ad8461";
+  };
+
+  buildInputs = [ ocaml ];
+
+  prefixKey = "-prefix ";
+
+  configureFlags = if transitional then "--transitional" else "--strict";
+
+  buildFlags = "world.opt";
+
+  meta = {
+    description = "Preprocessor-pretty-printer for OCaml";
+    longDescription = ''
+      Camlp5 is a preprocessor and pretty-printer for OCaml programs.
+      It also provides parsing and printing tools.
+    '';
+    homepage = "${webpage}";
+    license = "BSD";
+  };
+}