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

rivet: 2.7.2 -> 3.1.1

This commit is contained in:
Dmitry Kalinkin 2019-11-18 16:04:36 -05:00
parent 167e5cc9d7
commit 9a2182eef6
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,16 @@
{ stdenv, fetchurl, fetchpatch, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: { stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rivet"; pname = "rivet";
version = "2.7.2"; version = "3.1.1";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
sha256 = "1bxcb99a3l5d2gl93zgfzgw6v95kx1ss5045mkz3ciyw8w5nmb9l"; sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w";
}; };
patches = [ patches = [
./darwin.patch # configure relies on impure sw_vers to -Dunix ./darwin.patch # configure relies on impure sw_vers to -Dunix
(fetchpatch {
url = "https://gitlab.com/hepcedar/rivet/commit/37bd34f52cce66946ebb311a8fe61bfc5f69cc00.diff";
sha256 = "0wj3ilpfq2gpc33bj3800l9vyvc9lrrlj1x9ss5qki0yiqd8i2aa";
})
]; ];
latex = texlive.combine { inherit (texlive) latex = texlive.combine { inherit (texlive)
@ -32,26 +28,27 @@ stdenv.mkDerivation rec {
xkeyval xkeyval
xstring xstring
;}; ;};
buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ];
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; nativeBuildInputs = [ rsync makeWrapper ];
buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ];
propagatedBuildInputs = [ fastjet fastjet-contrib ];
preConfigure = '' preConfigure = ''
substituteInPlace analyses/Makefile.in \ substituteInPlace bin/rivet-build.in \
--replace "!(tmp)" "" --replace 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \
substituteInPlace bin/rivet-buildplugin.in \
--replace 'which' '"${which}/bin/which"' \ --replace 'which' '"${which}/bin/which"' \
--replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \
--replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " --replace 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
''; '';
preInstall = '' preInstall = ''
substituteInPlace bin/make-plots \ substituteInPlace bin/make-plots \
--replace '"which"' '"${which}/bin/which"' \ --replace '"which"' '"${which}/bin/which"' \
--replace '"latex"' '"${latex}/bin/latex"' \ --replace '"latex"' '"'$latex'/bin/latex"' \
--replace '"dvips"' '"${latex}/bin/dvips"' \ --replace '"dvips"' '"'$latex'/bin/dvips"' \
--replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \ --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \
--replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \ --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \
--replace '"kpsewhich"' '"${latex}/bin/kpsewhich"' \ --replace '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \
--replace '"convert"' '"${imagemagick.out}/bin/convert"' --replace '"convert"' '"${imagemagick.out}/bin/convert"'
substituteInPlace bin/rivet \ substituteInPlace bin/rivet \
--replace '"less"' '"${less}/bin/less"' --replace '"less"' '"${less}/bin/less"'
@ -62,9 +59,12 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-fastjet=${fastjet}" "--with-fastjet=${fastjet}"
"--with-hepmc=${hepmc2}"
"--with-yoda=${yoda}" "--with-yoda=${yoda}"
]; ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
"--with-hepmc3=${hepmc}"
] else [
"--with-hepmc=${hepmc}"
]);
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -25224,6 +25224,7 @@ in
pythia = callPackage ../development/libraries/physics/pythia { }; pythia = callPackage ../development/libraries/physics/pythia { };
rivet = callPackage ../development/libraries/physics/rivet { rivet = callPackage ../development/libraries/physics/rivet {
hepmc = hepmc2;
imagemagick = graphicsmagick-imagemagick-compat; imagemagick = graphicsmagick-imagemagick-compat;
}; };

4
pkgs/top-level/python-packages.nix
View File

@ -5579,8 +5579,8 @@ in {
retworkx = callPackage ../development/python-modules/retworkx { }; retworkx = callPackage ../development/python-modules/retworkx { };
rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override { rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override {
python2 = python; python3 = python;
})); }));
ripser = callPackage ../development/python-modules/ripser { }; ripser = callPackage ../development/python-modules/ripser { };