public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24583 from veprbl/yoda166

Browse Source 
yoda: 1.6.5 -> 1.6.6, provide version with ROOT
This commit is contained in:
Michael Raskin 2017-05-01 09:49:48 +02:00 committed by GitHub
commit 9c770f64c6
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/physics/rivet/default.nix
View File

@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
xcolor xcolor
xkeyval xkeyval
;}; ;};
buildInputs = [ ghostscript hepmc imagemagick python2 latex makeWrapper ]; buildInputs = [ hepmc imagemagick python2 latex makeWrapper ];
propagatedBuildInputs = [ fastjet gsl yoda ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
preInstall = '' preInstall = ''
substituteInPlace bin/make-plots \ substituteInPlace bin/make-plots \

20
pkgs/development/libraries/physics/yoda/default.nix
View File

@ -1,17 +1,29 @@
{ stdenv, fetchurl, python2Packages, makeWrapper }: { stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, withRootSupport ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yoda-${version}"; name = "yoda-${version}";
version = "1.6.5"; version = "1.6.6";
src = fetchurl { src = fetchurl {
url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
sha256 = "1i8lmj63cd3qnxl9k2cb1abap2pirhx7ffinm834wbpy9iszwxql"; sha256 = "088xx4q6b03bnj6xg5189m8wsznhal8aj3jk40sbj24idm4jl5yg";
}; };
pythonPath = []; # python wrapper support pythonPath = []; # python wrapper support
buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ]; patches = [
(fetchpatch {
url = "https://yoda.hepforge.org/hg/yoda/rev/3dbc8927e715?style=raw";
sha256 = "02rm34z9lbab66p7gpij12qwdph5fddpksg80qz0m537wjwy2ddy";
})
(fetchpatch {
url = "https://yoda.hepforge.org/hg/yoda/rev/669c2be582ef?style=raw";
sha256 = "0s705cl3bazpvpvy46vv1k223knwxq2yy5na1c6lv217sq9w86wj";
})
];
buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ]
++ stdenv.lib.optional withRootSupport root;
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/top-level/all-packages.nix
View File

@ -17889,6 +17889,9 @@ with pkgs;
thepeg = callPackage ../development/libraries/physics/thepeg { }; thepeg = callPackage ../development/libraries/physics/thepeg { };
yoda = callPackage ../development/libraries/physics/yoda { }; yoda = callPackage ../development/libraries/physics/yoda { };
yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda {
withRootSupport = true;
});
### MISC ### MISC