root: 6.04.18 -> 6.08.02

This relies on e9d60c56 ('libc++3.7: fix to use with modern compilers')
2017-01-01 17:52:03 -05:00
parent e9d60c5636
commit c7bcb99ff2
2 changed files with 4 additions and 8 deletions
@@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  name = "root-${version}";
-  version = "6.04.18";
+  version = "6.08.02";

  src = fetchurl {
    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9";
+    sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k";
  };

  buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ]
@@ -16,10 +16,6 @@ stdenv.mkDerivation rec {
    ;

  patches = [
-    (fetchpatch {
-      url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch";
-      sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
-    })
    ./sw_vers.patch

    # this prevents thisroot.sh from setting $p, which interferes with stdenv setup