Merging from trunk. I had to do two manual merges, quite trivial I think.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
parent 7ade207f6b 58f543f19f
commit e85500987b
119 changed files with 1750 additions and 1500 deletions
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -34,7 +34,7 @@ rec {
    cd ..
  '') ["minInit" "doMake" "defEnsureDir" "addInputs"];
      
-  name = "xxdiff-" + version;
+  name = "xxdiff-3.2";
  meta = {
    description = "Interactive merge tool";
  };