···

       
1
       
1
       
-
       
diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx

     

       
2
       
2
       
-
       
index d71cb74..076facb 100644

     

       
3
       
3
       
-
       
--- a/core/metacling/src/TCling.cxx

     

       
4
       
4
       
-
       
+++ b/core/metacling/src/TCling.cxx

     

       
5
       
5
       
-
       
@@ -756,7 +756,7 @@ int TCling_GenerateDictionary(const std::vector<std::string> &classes,

     

       
6
       
6
       
-
       
                gSystem->PrependPathName(dirbase, header);

     

       
7
       
7
       
-
       
                dir = gSystem->DirName(dir);

     

       
8
       
8
       
-
       
             }

     

       
9
       
9
       
-
       
-            fileContent += TString("#include \"") + header + "\"\n";

     

       
10
       
10
       
-
       
+            fileContent += (TString("#include \"") + header + "\"\n").Data();

     

       
11
       
11
       
-
       
          }

     

       
12
       
12
       
-
       
       }

     

       
13
       
13
       
-
       
       for (it = fwdDecls.begin(); it != fwdDecls.end(); ++it) {

     

       
14
       
14
       
-
       
@@ -1061,7 +1061,7 @@ TCling::TCling(const char *name, const char *title)

     

       
15
       
15
       
-
       
       ROOT::TMetaUtils::SetPathsForRelocatability(clingArgsStorage);

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
       // Add -I early so ASTReader can find the headers.

     

       
18
       
18
       
-
       
-      std::string interpInclude(TROOT::GetEtcDir());

     

       
19
       
19
       
-
       
+      std::string interpInclude(TROOT::GetEtcDir().Data());

     

       
20
       
20
       
-
       
       clingArgsStorage.push_back("-I" + interpInclude);

     

       
21
       
21
       
-
       
 

     

       
22
       
22
       
-
       
       // Add include path to etc/cling. FIXME: This is a short term solution. The

     

       
23
       
23
       
-
       
@@ -1070,7 +1070,7 @@ TCling::TCling(const char *name, const char *title)

     

       
24
       
24
       
-
       
       clingArgsStorage.push_back("-I" + interpInclude + "/cling");

     

       
25
       
25
       
-
       
 

     

       
26
       
26
       
-
       
       // Add the root include directory and etc/ to list searched by default.

     

       
27
       
27
       
-
       
-      clingArgsStorage.push_back(std::string("-I" + TROOT::GetIncludeDir()));

     

       
28
       
28
       
-
       
+      clingArgsStorage.push_back(std::string(("-I" + TROOT::GetIncludeDir()).Data()));

     

       
29
       
29
       
-
       
 

     

       
30
       
30
       
-
       
       // Add the current path to the include path

     

       
31
       
31
       
-
       
       // TCling::AddIncludePath(".");

     

       
32
       
32
       
-
       
diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx

     

       
33
       
33
       
-
       
index abf3929..e7dad98 100644

     

       
34
       
34
       
-
       
--- a/hist/hist/src/TFormula.cxx

     

       
35
       
35
       
-
       
+++ b/hist/hist/src/TFormula.cxx

     

       
36
       
36
       
-
       
@@ -1677,7 +1677,7 @@ void TFormula::ProcessFormula(TString &formula)

     

       
37
       
37
       
-
       
          if(fun.fName.Contains("::")) // add support for nested namespaces

     

       
38
       
38
       
-
       
          {

     

       
39
       
39
       
-
       
             // look for last occurence of "::"

     

       
40
       
40
       
-
       
-            std::string name(fun.fName);

     

       
41
       
41
       
-
       
+            std::string name(fun.fName.Data());

     

       
42
       
42
       
-
       
             size_t index = name.rfind("::");

     

       
43
       
43
       
-
       
             assert(index != std::string::npos);

     

       
44
       
44
       
-
       
             TString className = fun.fName(0,fun.fName(0,index).Length());

     

       
45
       
45
       
-
       
@@ -1869,7 +1869,7 @@ void TFormula::ProcessFormula(TString &formula)

     

       
46
       
46
       
-
       
 

     

       
47
       
47
       
-
       
          // save copy of inputFormula in a std::strig for the unordered map

     

       
48
       
48
       
-
       
          // and also formula is same as FClingInput typically and it will be modified

     

       
49
       
49
       
-
       
-         std::string inputFormula = std::string(formula);

     

       
50
       
50
       
-
       
+         std::string inputFormula = std::string(formula.Data());

     

       
51
       
51
       
-
       
 

     

       
52
       
52
       
-
       
 

     

       
53
       
53
       
-
       
          // valid input formula - try to put into Cling

     

       
54
       
54
       
-
       
diff --git a/main/src/nbmain.cxx b/main/src/nbmain.cxx

     

       
55
       
55
       
-
       
index 55d4f2f..8490149 100644

     

       
56
       
56
       
-
       
--- a/main/src/nbmain.cxx

     

       
57
       
57
       
-
       
+++ b/main/src/nbmain.cxx

     

       
58
       
58
       
-
       
@@ -173,9 +173,9 @@ static bool CreateStamp(string dest)

     

       
59
       
59
       
-
       
 

     

       
60
       
60
       
-
       
 int main()

     

       
61
       
61
       
-
       
 {

     

       
62
       
62
       
-
       
-   string rootbin(TROOT::GetBinDir());

     

       
63
       
63
       
-
       
-   string rootlib(TROOT::GetLibDir());

     

       
64
       
64
       
-
       
-   string rootetc(TROOT::GetEtcDir());

     

       
65
       
65
       
-
       
+   string rootbin(TROOT::GetBinDir().Data());

     

       
66
       
66
       
-
       
+   string rootlib(TROOT::GetLibDir().Data());

     

       
67
       
67
       
-
       
+   string rootetc(TROOT::GetEtcDir().Data());

     

       
68
       
68
       
-
       
 

     

       
69
       
69
       
-
       
    // If needed, install ROOT notebook files in the user's home directory

     

       
70
       
70
       
-
       
 #ifdef WIN32

     

       
71
       
71
       
-
       
diff --git a/math/minuit/src/TMinuitMinimizer.cxx b/math/minuit/src/TMinuitMinimizer.cxx

     

       
72
       
72
       
-
       
index 4e2082a..18215c0 100644

     

       
73
       
73
       
-
       
--- a/math/minuit/src/TMinuitMinimizer.cxx

     

       
74
       
74
       
-
       
+++ b/math/minuit/src/TMinuitMinimizer.cxx

     

       
75
       
75
       
-
       
@@ -454,7 +454,7 @@ std::string TMinuitMinimizer::VariableName(unsigned int ivar) const {

     

       
76
       
76
       
-
       
    // return the variable name

     

       
77
       
77
       
-
       
    if (!CheckMinuitInstance()) return std::string();

     

       
78
       
78
       
-
       
    if (!CheckVarIndex(ivar)) return std::string();

     

       
79
       
79
       
-
       
-   return std::string(fMinuit->fCpnam[ivar]);

     

       
80
       
80
       
-
       
+   return std::string(fMinuit->fCpnam[ivar].Data());

     

       
81
       
81
       
-
       
 }

     

       
82
       
82
       
-
       
 

     

       
83
       
83
       
-
       
 int TMinuitMinimizer::VariableIndex(const std::string & ) const {

     

       
84
       
84
       
-
       
diff --git a/tmva/tmva/src/Factory.cxx b/tmva/tmva/src/Factory.cxx

     

       
85
       
85
       
-
       
index 36060ef..a1bbe34 100644

     

       
86
       
86
       
-
       
--- a/tmva/tmva/src/Factory.cxx

     

       
87
       
87
       
-
       
+++ b/tmva/tmva/src/Factory.cxx

     

       
88
       
88
       
-
       
@@ -390,7 +390,7 @@ TMVA::MethodBase* TMVA::Factory::BookMethod( TMVA::DataLoader *loader, TString t

     

       
89
       
89
       
-
       
    // initialize methods

     

       
90
       
90
       
-
       
    IMethod* im;

     

       
91
       
91
       
-
       
    if (!boostNum) {

     

       
92
       
92
       
-
       
-      im = ClassifierFactory::Instance().Create( std::string(theMethodName),

     

       
93
       
93
       
-
       
+      im = ClassifierFactory::Instance().Create( std::string(theMethodName.Data()),

     

       
94
       
94
       
-
       
                                                  fJobName,

     

       
95
       
95
       
-
       
                                                  methodTitle,

     

       
96
       
96
       
-
       
                                                  loader->DefaultDataSetInfo(),

     

       
97
       
97
       
-
       
@@ -933,7 +933,7 @@ void TMVA::Factory::TrainAllMethods()

     

       
98
       
98
       
-
       
 

     

       
99
       
99
       
-
       
        // recreate

     

       
100
       
100
       
-
       
        m = dynamic_cast<MethodBase*>( ClassifierFactory::Instance()

     

       
101
       
101
       
-
       
-                   .Create( std::string(Types::Instance().GetMethodName(methodType)),

     

       
102
       
102
       
-
       
+                   .Create( std::string(Types::Instance().GetMethodName(methodType).Data()),

     

       
103
       
103
       
-
       
                       dataSetInfo, weightfile ) );

     

       
104
       
104
       
-
       
        if( m->GetMethodType() == Types::kCategory ){

     

       
105
       
105
       
-
       
       MethodCategory *methCat = (dynamic_cast<MethodCategory*>(m));

     

       
106
       
106
       
-
       
diff --git a/tmva/tmva/src/MethodBoost.cxx b/tmva/tmva/src/MethodBoost.cxx

     

       
107
       
107
       
-
       
index 1349e5d..2125ab3 100644

     

       
108
       
108
       
-
       
--- a/tmva/tmva/src/MethodBoost.cxx

     

       
109
       
109
       
-
       
+++ b/tmva/tmva/src/MethodBoost.cxx

     

       
110
       
110
       
-
       
@@ -389,7 +389,7 @@ void TMVA::MethodBoost::Train()

     

       
111
       
111
       
-
       
       // the first classifier shows the option string output, the rest not

     

       
112
       
112
       
-
       
       if (fCurrentMethodIdx>0) TMVA::MsgLogger::InhibitOutput();

     

       
113
       
113
       
-
       
 

     

       
114
       
114
       
-
       
-      IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName),

     

       
115
       
115
       
-
       
+      IMethod* method = ClassifierFactory::Instance().Create(std::string(fBoostedMethodName.Data()),

     

       
116
       
116
       
-
       
                                                              GetJobName(),

     

       
117
       
117
       
-
       
                                                              Form("%s_B%04i", fBoostedMethodTitle.Data(),fCurrentMethodIdx),

     

       
118
       
118
       
-
       
                                                              DataInfo(),

     

       
119
       
119
       
-
       
diff --git a/tmva/tmva/src/MethodCategory.cxx b/tmva/tmva/src/MethodCategory.cxx

     

       
120
       
120
       
-
       
index c2cbe80..d278cca 100644

     

       
121
       
121
       
-
       
--- a/tmva/tmva/src/MethodCategory.cxx

     

       
122
       
122
       
-
       
+++ b/tmva/tmva/src/MethodCategory.cxx

     

       
123
       
123
       
-
       
@@ -147,7 +147,7 @@ TMVA::IMethod* TMVA::MethodCategory::AddMethod( const TCut& theCut,

     

       
124
       
124
       
-
       
                                                 const TString& theTitle,

     

       
125
       
125
       
-
       
                                                 const TString& theOptions )

     

       
126
       
126
       
-
       
 {

     

       
127
       
127
       
-
       
-   std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod));

     

       
128
       
128
       
-
       
+   std::string addedMethodName = std::string(Types::Instance().GetMethodName(theMethod).Data());

     

       
129
       
129
       
-
       
 

     

       
130
       
130
       
-
       
    Log() << kINFO << "Adding sub-classifier: " << addedMethodName << "::" << theTitle << Endl;

     

       
131
       
131
       
-
       
 

     

       
132
       
132
       
-
       
diff --git a/tmva/tmva/src/MethodCompositeBase.cxx b/tmva/tmva/src/MethodCompositeBase.cxx

     

       
133
       
133
       
-
       
index 98fa5da..96bd9a3 100644

     

       
134
       
134
       
-
       
--- a/tmva/tmva/src/MethodCompositeBase.cxx

     

       
135
       
135
       
-
       
+++ b/tmva/tmva/src/MethodCompositeBase.cxx

     

       
136
       
136
       
-
       
@@ -194,7 +194,7 @@ void TMVA::MethodCompositeBase::ReadWeightsFromXML( void* wghtnode )

     

       
137
       
137
       
-
       
          ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodTypeName), methodName,  optionString );

     

       
138
       
138
       
-
       
       }

     

       
139
       
139
       
-
       
       fMethods.push_back(ClassifierFactory::Instance().Create(

     

       
140
       
140
       
-
       
-                                                              std::string(methodTypeName),jobName, methodName,DataInfo(),optionString));

     

       
141
       
141
       
-
       
+                                                              std::string(methodTypeName.Data()),jobName, methodName,DataInfo(),optionString));

     

       
142
       
142
       
-
       
 

     

       
143
       
143
       
-
       
       fMethodWeight.push_back(methodWeight);

     

       
144
       
144
       
-
       
       MethodBase* meth = dynamic_cast<MethodBase*>(fMethods.back());

     

       
145
       
145
       
-
       
@@ -259,7 +259,7 @@ void  TMVA::MethodCompositeBase::ReadWeightsFromStream( std::istream& istr )

     

       
146
       
146
       
-
       
             ((TMVA::MethodBoost*)this)->BookMethod( Types::Instance().GetMethodType( methodName), methodTitle,  optionString );

     

       
147
       
147
       
-
       
       }

     

       
148
       
148
       
-
       
       else methodTitle=Form("%s (%04i)",GetMethodName().Data(),fCurrentMethodIdx);

     

       
149
       
149
       
-
       
-      fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName), jobName,

     

       
150
       
150
       
-
       
+      fMethods.push_back(ClassifierFactory::Instance().Create( std::string(methodName.Data()), jobName,

     

       
151
       
151
       
-
       
                                                                methodTitle,DataInfo(), optionString) );

     

       
152
       
152
       
-
       
       fMethodWeight.push_back( methodWeight );

     

       
153
       
153
       
-
       
       if(MethodBase* m = dynamic_cast<MethodBase*>(fMethods.back()) )

     

       
154
       
154
       
-
       
diff --git a/tmva/tmva/src/Reader.cxx b/tmva/tmva/src/Reader.cxx

     

       
155
       
155
       
-
       
index 94a8b28..0b67867 100644

     

       
156
       
156
       
-
       
--- a/tmva/tmva/src/Reader.cxx

     

       
157
       
157
       
-
       
+++ b/tmva/tmva/src/Reader.cxx

     

       
158
       
158
       
-
       
@@ -401,7 +401,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( const TString& methodTag, const TString& w

     

       
159
       
159
       
-
       
 

     

       
160
       
160
       
-
       
 TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const TString& weightfile )

     

       
161
       
161
       
-
       
 {

     

       
162
       
162
       
-
       
-   IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )),

     

       
163
       
163
       
-
       
+   IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()),

     

       
164
       
164
       
-
       
                                                       DataInfo(), weightfile );

     

       
165
       
165
       
-
       
 

     

       
166
       
166
       
-
       
    MethodBase *method = (dynamic_cast<MethodBase*>(im));

     

       
167
       
167
       
-
       
@@ -440,7 +440,7 @@ TMVA::IMethod* TMVA::Reader::BookMVA( TMVA::Types::EMVA methodType, const char*

     

       
168
       
168
       
-
       
 #if ROOT_VERSION_CODE >= ROOT_VERSION(5,26,00)

     

       
169
       
169
       
-
       
 

     

       
170
       
170
       
-
       
    // books MVA method from weightfile

     

       
171
       
171
       
-
       
-   IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType )),

     

       
172
       
172
       
-
       
+   IMethod* im = ClassifierFactory::Instance().Create(std::string(Types::Instance().GetMethodName( methodType ).Data()),

     

       
173
       
173
       
-
       
                                                       DataInfo(), "" );

     

       
174
       
174
       
-
       
 

     

       
175
       
175
       
-
       
    MethodBase *method = (dynamic_cast<MethodBase*>(im));

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2

     

       
2
       
2
       
-
       
, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl

     

       
2
       
2
       
+
       
, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash

     

       
3
       
3
       
 
       
, Cocoa, OpenGL, noSplash ? false }:

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
6
       
 
       
  name = "root-${version}";

     

       
7
       
7
       
-
       
  version = "6.10.04";

     

       
7
       
7
       
+
       
  version = "6.10.08";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
 
       
    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";

     

       
11
       
11
       
-
       
    sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6";

     

       
11
       
11
       
+
       
    sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  nativeBuildInputs = [ pkgconfig ];

     

       
15
       
15
       
-
       
  buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl ]

     

       
15
       
15
       
+
       
  buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]

     

       
16
       
16
       
 
       
    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ]

     

       
17
       
17
       
 
       
    ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]

     

       
18
       
18
       
 
       
    ;

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  patches = [

     

       
21
       
21
       
 
       
    ./sw_vers.patch

     

       
22
       
22
       
-
       


     

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

     

       
24
       
24
       
-
       
    ./thisroot.patch

     

       
25
       
25
       
-
       


     

       
26
       
26
       
-
       
    # https://sft.its.cern.ch/jira/browse/ROOT-8728

     

       
27
       
27
       
-
       
    ./ROOT-8728-extra.patch

     

       
28
       
22
       
 
       
  ];

     

       
29
       
23
       
 
       


     

       
30
       
24
       
 
       
  preConfigure = ''

     

···

       
1
       
1
       
-
       
diff --git a/config/thisroot.sh b/config/thisroot.sh

     

       
2
       
2
       
-
       
index 85dee20..532cb28 100644

     

       
3
       
3
       
-
       
--- a/config/thisroot.sh

     

       
4
       
4
       
-
       
+++ b/config/thisroot.sh

     

       
5
       
5
       
-
       
@@ -15,8 +15,8 @@ drop_from_path()

     

       
6
       
6
       
-
       
       return 1

     

       
7
       
7
       
-
       
    fi

     

       
8
       
8
       
-
       
 

     

       
9
       
9
       
-
       
-   p=$1

     

       
10
       
10
       
-
       
-   drop=$2

     

       
11
       
11
       
-
       
+   local p=$1

     

       
12
       
12
       
-
       
+   local drop=$2

     

       
13
       
13
       
-
       
 

     

       
14
       
14
       
-
       
    newpath=`echo $p | sed -e "s;:${drop}:;:;g" \

     

       
15
       
15
       
-
       
                           -e "s;:${drop};;g"   \

     

···

       
1
       
1
       
+
       
{ stdenv, fetchFromGitHub }:

     

       
2
       
2
       
+
       


     

       
3
       
3
       
+
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
+
       
  name = "xxHash-${version}";

     

       
5
       
5
       
+
       
  version = "0.6.3.20171018";

     

       
6
       
6
       
+
       


     

       
7
       
7
       
+
       
  src = fetchFromGitHub {

     

       
8
       
8
       
+
       
    sha256 = "0061ivxpx0p24m4vg7kfx9fs9f0jxvv4g76bmyss5gp90p05hc18";

     

       
9
       
9
       
+
       
    rev = "333804ccf0c0339451accac023deeab9e5f7c002";

     

       
10
       
10
       
+
       
    repo = "xxHash";

     

       
11
       
11
       
+
       
    owner = "Cyan4973";

     

       
12
       
12
       
+
       
  };

     

       
13
       
13
       
+
       


     

       
14
       
14
       
+
       
  outputs = [ "out" "dev" ];

     

       
15
       
15
       
+
       


     

       
16
       
16
       
+
       
  makeFlags = [ "PREFIX=$(out)" "INCLUDEDIR=$(dev)/include" ];

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
  meta = with stdenv.lib; {

     

       
19
       
19
       
+
       
    description = "Extremely fast hash algorithm";

     

       
20
       
20
       
+
       
    longDescription = ''

     

       
21
       
21
       
+
       
      xxHash is an Extremely fast Hash algorithm, running at RAM speed limits.

     

       
22
       
22
       
+
       
      It successfully completes the SMHasher test suite which evaluates

     

       
23
       
23
       
+
       
      collision, dispersion and randomness qualities of hash functions. Code is

     

       
24
       
24
       
+
       
      highly portable, and hashes are identical on all platforms (little / big

     

       
25
       
25
       
+
       
      endian).

     

       
26
       
26
       
+
       
    '';

     

       
27
       
27
       
+
       
    homepage = https://github.com/Cyan4973/xxHash;

     

       
28
       
28
       
+
       
    license = with licenses; [ bsd2 gpl2 ];

     

       
29
       
29
       
+
       
    platforms = platforms.unix;

     

       
30
       
30
       
+
       
  };

     

       
31
       
31
       
+
       
}

     

···

       
11059
       
11059
       
 
       


     

       
11060
       
11060
       
 
       
  xvidcore = callPackage ../development/libraries/xvidcore { };

     

       
11061
       
11061
       
 
       


     

       
11062
       
11062
       
+
       
  xxHash = callPackage ../development/libraries/xxHash {};

     

       
11063
       
11063
       
+
       


     

       
11062
       
11064
       
 
       
  xylib = callPackage ../development/libraries/xylib { };

     

       
11063
       
11065
       
 
       


     

       
11064
       
11066
       
 
       
  yajl = callPackage ../development/libraries/yajl { };