diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-06-25 09:14:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-25 09:14:30 +0100 |
commit | ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e (patch) | |
tree | 453e7a8666adfbc9c5e23abb9bf64537df5a91b3 | |
parent | fcd5804d7f72c1252e6dfc10924d17eb52409379 (diff) | |
parent | ada12f46dc3ca9b57e896831d1052e7a49d311f5 (diff) | |
download | nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.tar nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.tar.gz nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.tar.bz2 nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.tar.lz nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.tar.xz nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.tar.zst nixlib-ad42e5f6e5dacf7c5215e8a930e3a90577c5d24e.zip |
Merge pull request #26795 from veprbl/root_6.10.00
root: 6.09.02 -> 6.10.00
-rw-r--r-- | pkgs/applications/science/misc/root/ROOT-8728-extra.patch | 25 | ||||
-rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 12 |
2 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch index ec8c160c6f3b..a396a848f142 100644 --- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch +++ b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch @@ -1,16 +1,3 @@ -diff --git a/core/base/inc/ROOT/StringConv.hxx b/core/base/inc/ROOT/StringConv.hxx -index 629fc18..4efa54a 100644 ---- a/core/base/inc/ROOT/StringConv.hxx -+++ b/core/base/inc/ROOT/StringConv.hxx -@@ -89,7 +89,7 @@ EFromHumanReadableSize FromHumanReadableSize(std::string_view str, T &value) - size_t size = str.size(); - size_t cur; - // Parse leading numeric factor -- const double coeff = stod(str, &cur); -+ const double coeff = stod(static_cast<std::string>(str), &cur); - - // Skip any intermediate white space - while (cur<size && isspace(str[cur])) ++cur; diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx index d71cb74..076facb 100644 --- a/core/metacling/src/TCling.cxx @@ -186,15 +173,3 @@ index 94a8b28..0b67867 100644 DataInfo(), "" ); MethodBase *method = (dynamic_cast<MethodBase*>(im)); -diff -aru a/core/base/inc/TString.h b/core/base/inc/TString.h ---- a/core/base/inc/TString.h -+++ b/core/base/inc/TString.h -@@ -106,7 +106,7 @@ - char operator[](Ssiz_t i) const; // Index with bounds checking - - operator std::string_view() const { return std::string_view(Data(),fExtent); } -- operator std::string() const { return std::string_view(Data(),fExtent).to_string(); } -+ operator std::string() const { return static_cast<std::string>(std::string_view(Data(),fExtent)); } - - const char *Data() const; - Ssiz_t Length() const { return fExtent; } diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 726f6352c957..8916a9fd1677 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.09.02"; + version = "6.10.00"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0fc6b0l7bw66cyckxs4ikvyzcv1zlfx88205jx153smdhih0jj2k"; + sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { ./thisroot.patch # https://sft.its.cern.ch/jira/browse/ROOT-8728 - (fetchpatch { - url = "https://sft.its.cern.ch/jira/secure/attachment/20025/0001-std-string_view-has-no-more-to_string.patch"; - sha256 = "0ngyk960xfrcsj4vhr1ax8h85fx0g1cfycxi3k35a6ych2zmyg8q"; - }) ./ROOT-8728-extra.patch ]; @@ -47,6 +43,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" + "-Dimt=OFF" "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" @@ -66,7 +63,8 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" + ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; enableParallelBuilding = true; |