* Valgrind 3.2.0.

* Removed callgrind.

svn path=/nixpkgs/trunk/; revision=5410

pkgs/development/tools/misc/callgrind/builder.sh

@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-postInstall=postInstall
-postInstall() {
-    # !!! fix for other than x86-linux
-    ln -s $valgrind/lib/valgrind/x86-linux/*.so $out/lib/valgrind/x86-linux/
-}
-
-genericBuild

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

@@ -1,18 +0,0 @@
-{stdenv, fetchurl, which, perl, valgrind}:
-
-stdenv.mkDerivation {
-  name = "callgrind-0.10.1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/callgrind-0.10.1.tar.bz2;
-    md5 = "6d8acca6b58b0b72804339d04426d550";
-  };
-
-  # Callgrind wants to install in the same prefix as Valgrind.  This
-  # patch fixes that.
-  patches = [./prefix.patch];
-
-  buildInputs = [which perl valgrind];
-  inherit valgrind;
-}

pkgs/development/tools/misc/callgrind/prefix.patch

@@ -1,91 +0,0 @@
-diff -rc callgrind-0.10.1-orig/callgrind.in callgrind-0.10.1/callgrind.in
-*** callgrind-0.10.1-orig/callgrind.in	2005-11-14 03:21:14.000000000 +0100
---- callgrind-0.10.1/callgrind.in	2006-01-31 13:35:59.000000000 +0100
-***************
-*** 11,14 ****
-          esac
-  esac
-  
-! exec @VG_BINDIR@/valgrind --tool=callgrind $*
---- 11,14 ----
-          esac
-  esac
-  
-! VALGRIND_LIB=@prefix@/lib/valgrind/ exec @VG_BINDIR@/valgrind --tool=callgrind "$@"
-diff -rc callgrind-0.10.1-orig/configure callgrind-0.10.1/configure
-*** callgrind-0.10.1-orig/configure	2005-11-25 02:00:26.000000000 +0100
---- callgrind-0.10.1/configure	2006-01-31 13:41:48.000000000 +0100
-***************
-*** 3461,3467 ****
-     { (exit 1); exit 1; }; }
-    fi
-  else
-!   vg_exec=`which $prefix/bin/valgrind`
-    if test "x$vg_exec" = "x"; then
-      echo "$as_me:$LINENO: result: not found in $prefix/bin" >&5
-  echo "${ECHO_T}not found in $prefix/bin" >&6
---- 3461,3467 ----
-     { (exit 1); exit 1; }; }
-    fi
-  else
-!   vg_exec=`which valgrind`
-    if test "x$vg_exec" = "x"; then
-      echo "$as_me:$LINENO: result: not found in $prefix/bin" >&5
-  echo "${ECHO_T}not found in $prefix/bin" >&6
-***************
-*** 3484,3493 ****
-  
-  
-  
-! VG_BINDIR="$prefix/bin"
-  
-  cat >>confdefs.h <<_ACEOF
-! #define VG_PREFIX "$prefix"
-  _ACEOF
-  
-  
---- 3484,3493 ----
-  
-  
-  
-! VG_BINDIR="$vg_binpath"
-  
-  cat >>confdefs.h <<_ACEOF
-! #define VG_PREFIX "$ac_default_prefix"
-  _ACEOF
-  
-  
-***************
-*** 3495,3501 ****
-  use_pkg_config="yes"
-  echo "$as_me:$LINENO: checking for valgrind version" >&5
-  echo $ECHO_N "checking for valgrind version... $ECHO_C" >&6
-! vg_version=`$prefix/bin/valgrind --version`
-  case "${vg_version}" in
-      valgrind-3.1.*)
-  	CG_SRCDIR=build31
---- 3495,3501 ----
-  use_pkg_config="yes"
-  echo "$as_me:$LINENO: checking for valgrind version" >&5
-  echo $ECHO_N "checking for valgrind version... $ECHO_C" >&6
-! vg_version=`$vg_binpath/valgrind --version`
-  case "${vg_version}" in
-      valgrind-3.1.*)
-  	CG_SRCDIR=build31
-***************
-*** 3522,3528 ****
-  echo "${ECHO_T}${vg_version}" >&6
-  
-  # get architecture from .pc file
-! eval "pkgdir=$libdir/pkgconfig"
-  echo "$as_me:$LINENO: checking for arch/os used in valgrind installation" >&5
-  echo $ECHO_N "checking for arch/os used in valgrind installation... $ECHO_C" >&6
-  
---- 3522,3528 ----
-  echo "${ECHO_T}${vg_version}" >&6
-  
-  # get architecture from .pc file
-! eval "pkgdir=$ac_default_prefix/lib/pkgconfig"
-  echo "$as_me:$LINENO: checking for arch/os used in valgrind installation" >&5
-  echo $ECHO_N "checking for arch/os used in valgrind installation... $ECHO_C" >&6
-  

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

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "valgrind-3.1.1";
+  name = "valgrind-3.2.0";
   src = fetchurl {
-    url = http://www.valgrind.org/downloads/valgrind-3.1.1.tar.bz2;
+    url = http://www.valgrind.org/downloads/valgrind-3.2.0.tar.bz2;
-    md5 = "3bbfafedb59c19bf75977381ce2eb6d7";
+    md5 = "c418026ce7c38a740ef17efe59509fcf";
   };
 }

pkgs/top-level/all-packages.nix

@@ -461,10 +461,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  callgrind = (import ../development/tools/misc/callgrind) {
-    inherit fetchurl stdenv which perl valgrind;
-  };
-
   kcachegrind = (import ../development/tools/misc/kcachegrind) {
     inherit fetchurl stdenv kdelibs zlib perl expat libpng libjpeg;
     inherit (xlibs) libX11 libXext libSM;