Commit 6fc8fe28 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin
Browse files

rivet: 3.1.10 -> 4.0.1

parent 393c1b36

pkgs/applications/science/physics/sherpa/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, autoconf, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:

{ lib, stdenv, fetchurl, autoconf, gfortran, hepmc3, fastjet, lhapdf, rivet, sqlite }:



stdenv.mkDerivation rec {

  pname = "sherpa";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 


  configureFlags = [

    "--with-sqlite3=${sqlite.dev}"

    "--enable-hepmc2=${hepmc2}"

    "--enable-hepmc3=${hepmc3}"

    "--enable-fastjet=${fastjet}"

    "--enable-lhapdf=${lhapdf}"

    "--enable-rivet=${rivet}"

pkgs/development/libraries/physics/rivet/default.nix

+27 −27
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }:

{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hdf5, hepmc3, highfive, imagemagick, less, pkg-config, python3, rsync, texliveBasic, yoda, which, makeWrapper }:



stdenv.mkDerivation rec {

  pname = "rivet";

  version = "3.1.10";

  version = "4.0.1";



  src = fetchurl {

    url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";

    hash = "sha256-RYuODfHec46ZctJLJg6qCH3xLJnU/p3uU3fUfqakmRk=";

    hash = "sha256-ToaS1uilOWHHeYPra6SJPDdlzyP3BXieTYZb5Iku/3k=";

  };



  latex = texliveBasic.withPackages (ps: with ps; [
@@ -25,43 +25,43 @@ stdenv.mkDerivation rec { 
    xstring

  ]);



  nativeBuildInputs = [ rsync makeWrapper ];

  buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ];

  propagatedBuildInputs = [ fastjet fastjet-contrib ];

  nativeBuildInputs = [ rsync makeWrapper pkg-config ];

  buildInputs = [ hepmc3 highfive imagemagick python3 latex python3.pkgs.yoda ];

  propagatedBuildInputs = [ hdf5 fastjet fastjet-contrib ];



  preConfigure = ''

    substituteInPlace configure \

      --replace-fail 'if test $HEPMC_VERSION -le 310; then' 'if false; then'

    substituteInPlace bin/rivet-build.in \

      --replace 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \

      --replace 'which' '"${which}/bin/which"' \

      --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \

      --replace 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "

      --replace-fail 'num_jobs=$(getconf _NPROCESSORS_ONLN)' 'num_jobs=''${NIX_BUILD_CORES:-$(getconf _NPROCESSORS_ONLN)}' \

      --replace-fail 'which' '"${which}/bin/which"' \

      --replace-fail 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \

      --replace-fail 'mycxxflags="' "mycxxflags=\"$NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "

  '';



  preInstall = ''

    substituteInPlace bin/make-plots \

      --replace '"which"' '"${which}/bin/which"' \

      --replace '"latex"' '"'$latex'/bin/latex"' \

      --replace '"dvips"' '"'$latex'/bin/dvips"' \

      --replace '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \

      --replace '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \

      --replace '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \

      --replace '"convert"' '"${imagemagick.out}/bin/convert"'

      --replace-fail '"which"' '"${which}/bin/which"' \

      --replace-fail '"latex"' '"'$latex'/bin/latex"' \

      --replace-fail '"dvips"' '"'$latex'/bin/dvips"' \

      --replace-fail '"ps2pdf"' '"${ghostscript}/bin/ps2pdf"' \

      --replace-fail '"ps2eps"' '"${ghostscript}/bin/ps2eps"' \

      --replace-fail '"kpsewhich"' '"'$latex'/bin/kpsewhich"' \

      --replace-fail '"convert"' '"${imagemagick.out}/bin/convert"'

    substituteInPlace bin/rivet \

      --replace '"less"' '"${less}/bin/less"'

    substituteInPlace bin/rivet-mkhtml \

      --replace '"make-plots"' \"$out/bin/make-plots\" \

      --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \

      --replace 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [('

      --replace-fail '"less"' '"${less}/bin/less"'

    substituteInPlace bin/rivet-mkhtml-tex \

      --replace-fail '"make-plots"' \"$out/bin/make-plots\" \

      --replace-fail '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\" \

      --replace-fail 'ch_cmd = [sys.executable, os.path.join(os.path.dirname(__file__),' 'ch_cmd = [('

  '';



  configureFlags = [

    "--with-fastjet=${fastjet}"

    "--with-yoda=${yoda}"

  ] ++ (if lib.versions.major hepmc.version == "3" then [

    "--with-hepmc3=${hepmc}"

  ] else [

    "--with-hepmc=${hepmc}"

  ]);

    "--with-hepmc3=${hepmc3}"

    "--with-highfive=${highfive}"

  ];



  enableParallelBuilding = true;

pkgs/development/libraries/physics/thepeg/default.nix

+12 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, autoreconfHook, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:

{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, boost, fastjet, gsl, hepmc3, lhapdf, rivet, zlib }:



stdenv.mkDerivation rec {

  pname = "thepeg";
@@ -9,12 +9,21 @@ stdenv.mkDerivation rec { 
    hash = "sha256-rDWXmuicKWCMqSwVakn/aKrOeloSoMkvCgGoM9LTRXI=";

  };



  patches = [

    # Rivet 4 support

    (fetchpatch {

      url = "https://github.com/hep-mirrors/thepeg/commit/d974704fe48876c13cb7f544cabcf6ef30c00f48.diff";

      hash = "sha256-HzyNigbhWzSpjvvYw3+LZvnrSoV6Pmzghw/5VY5nlqk=";

    })

  ];



  nativeBuildInputs = [ autoreconfHook ];



  buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];

  buildInputs = [ boost fastjet gsl hepmc3 lhapdf rivet zlib ];



  configureFlags = [

    "--with-hepmc=${hepmc2}"

    "--with-hepmc=${hepmc3}"

    "--with-hepmcversion=3"

    "--with-rivet=${rivet}"

    "--without-javagui"

  ];

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -37664,7 +37664,6 @@ with pkgs; 
  };















  rivet = callPackage ../development/libraries/physics/rivet {













    hepmc = hepmc2;















    imagemagick = graphicsmagick-imagemagick-compat;















  };