Merged with trunk

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

pkgs/development/tools/misc/elfutils/0.127.nix

@@ -1,7 +1,7 @@
-{stdenv, fetchurl}:
+args: with args;
 
 stdenv.mkDerivation {
-  name = "elfutils-0.127";
+  name = "elfutils-"+version;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz;
     sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv";

pkgs/development/tools/misc/elfutils/0.131.nix

@@ -0,0 +1,9 @@
+args: with args;
+
+stdenv.mkDerivation {
+  name = "elfutils-"+version;
+  src = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz;
+    sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll";
+  };
+}

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

@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "strace-4.5.15";
+  name = "strace-4.5.16";
 
   src = fetchurl {
-    url = mirror://sourceforge/strace/strace-4.5.15.tar.gz;
-    sha256 = "07n62yv53p2hsb59srfaxb0kk8b6p6iq77drmf65pq8jpa50s9ip";
+    url = mirror://sourceforge/strace/strace-4.5.16.tar.bz2;
+    sha256 = "15ks9i1gv7mbyiwnzbjls2xy0pyv5x4j9a5ca2x0258fq8lxwdhp";
   };
 }

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

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = "mirror://sourceforge/swig/swig-1.3.33.tar.gz";
+    url = mirror://sourceforge/swig/swig-1.3.33.tar.gz;
     sha256 = "02rz31i642sbsngny7k98d9hxlkcb9snvbzlnz3sh0qiyr3ciggv";
   };
 

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

@@ -1,16 +1,17 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "valgrind-3.2.3";
+  name = "valgrind-3.3.0";
   src = fetchurl {
-    url = http://valgrind.org/downloads/valgrind-3.2.3.tar.bz2;
-    sha256 = "0hf48y13mm1c1zg59bvkbr0lzcwng5mb33lgiv3d0gzl4w2r5jhv";
+    url = http://valgrind.org/downloads/valgrind-3.3.0.tar.bz2;
+    sha256 = "0yllx5a2f5bx18gqz74aikr27zxwpblswn65lqvm9rbzswlq5w2s";
   };
 
   configureFlags =
     if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
 
   meta = {
+    homepage = http://www.valgrind.org/;
     description = "Award-winning suite of tools for debugging and profiling Linux programs";
   };
 }

pkgs/development/tools/parsing/alex/default.nix

@@ -0,0 +1,23 @@
+{stdenv, fetchurl, ghc, perl}:
+
+stdenv.mkDerivation {
+  name = "alex-2.1.0";
+  src = fetchurl {
+    url = http://www.haskell.org/alex/dist/2.1.0/alex-2.1.0.tar.gz;
+    sha1 = "37599b7be5249d639b3a5a3fdc61907dc4dad660";
+  };
+  buildInputs = [ghc perl];
+
+  configurePhase = "
+    ghc --make Setup.lhs
+    ./Setup configure --prefix=\"\${out}\"
+  ";
+
+  buildPhase = "
+    ./Setup build
+  ";
+
+  installPhase = "
+    ./Setup install
+  ";
+}

pkgs/development/tools/parsing/bison/bison-1.875.nix

@@ -5,7 +5,9 @@ assert m4 != null;
 stdenv.mkDerivation {
   name = "bison-1.875";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2;
+    urls = [ http://nix.cs.uu.nl/dist/tarballs/bison-1.875.tar.bz2 
+	ftp://ftp.gnu.org/pub/gnu/bison/bison-1.875.tar.bz2 
+      ];
     md5 = "b7f8027b249ebd4dd0cc948943a71af0";
   };
   buildInputs = [m4];

pkgs/development/tools/parsing/flex/flex-2.5.4a.nix

@@ -5,7 +5,7 @@ assert yacc != null;
 stdenv.mkDerivation {
   name = "flex-2.5.4a";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/flex-2.5.4a.tar.gz;
+    url = mirror://sourceforge/flex/flex-2.5.4a.tar.gz;
     md5 = "bd8753d0b22e1f4ec87a553a73021adf";
   };
   buildInputs = [yacc];