Updating from trunk

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

pkgs/development/tools/misc/gdb/default.nix

@@ -1,5 +1,5 @@
 { fetchurl, stdenv, ncurses, readline, gmp, mpfr, expat, texinfo
-, dejagnu, target ? null }:
+, dejagnu, python, target ? null }:
 
 let
     basename = "gdb-7.2";
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1w0h6hya0bl46xddd57mdzwmffplwglhnh9x9hv46ll4mf44ni5z";
   };
 
-  # TODO: Add optional support for Python scripting.
-  buildInputs = [ ncurses readline gmp mpfr expat texinfo ]
+  buildInputs = [ ncurses readline gmp mpfr expat texinfo python ]
     ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags =

pkgs/development/tools/misc/xxdiff/3.2.nix

@@ -37,5 +37,6 @@ rec {
   name = "xxdiff-3.2";
   meta = {
     description = "Interactive merge tool";
+    homepage = http://furius.ca/xxdiff/;
   };
 }