diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index da127b2f8ee..b4b56be9c6d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, fetchpatch, perl, gdb }: stdenv.mkDerivation rec { - name = "valgrind-3.10.1"; + name = "valgrind-3.11.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"; + sha256 = "0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc"; }; - patches = [(fetchpatch { - name = "glibc-2.21.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" - + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; - sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; - }) ./linux-4.0.patch]; + patches = + [ (fetchpatch { + name = "glibc-2.21.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk" + + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69"; + sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; + }) + ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/tools/analysis/valgrind/linux-4.0.patch b/pkgs/development/tools/analysis/valgrind/linux-4.0.patch deleted file mode 100644 index 1a2c2d86207..00000000000 --- a/pkgs/development/tools/analysis/valgrind/linux-4.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur valgrind-3.10.1/configure valgrind-3.10.1-patch/configure ---- valgrind-3.10.1/configure 2014-11-25 11:42:25.000000000 -0800 -+++ valgrind-3.10.1-patch/configure 2015-04-21 09:45:37.656113841 -0700 -@@ -5553,7 +5553,7 @@ - kernel=`uname -r` - - case "${kernel}" in -- 2.6.*|3.*) -+ 2.6.*|3.*|4.*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5 - $as_echo "2.6.x/3.x family (${kernel})" >&6; } -