Unverified Commit dea87329 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

rivet: 4.0.2 -> 4.0.3 (#383055)

parents 2e568124 facea472

pkgs/development/libraries/physics/rivet/default.nix→pkgs/by-name/ri/rivet/package.nix

+9 −9
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ 
  fastjet,

  fastjet-contrib,

  ghostscript,

  graphicsmagick-imagemagick-compat,

  hdf5,

  hepmc3,

  highfive,

  imagemagick,

  less,

  pkg-config,

  python3,
@@ -21,11 +21,11 @@ 


stdenv.mkDerivation rec {

  pname = "rivet";

  version = "4.0.2";

  version = "4.0.3";



  src = fetchurl {

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

    hash = "sha256-ZaOzb0K/94LtJ2eTDmaeCbFAiZYF15cvyPd3hbSogsA=";

    hash = "sha256-27l7dp0Yd/NMPFAZASe/2nhHvOx5uh3llWH99DzdSGk=";

  };



  latex = texliveBasic.withPackages (
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec { 
    pkg-config

  ];

  buildInputs = [

    graphicsmagick-imagemagick-compat

    hepmc3

    highfive

    imagemagick

    python3

    latex

    python3.pkgs.yoda
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec { 
      --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"'

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

    substituteInPlace bin/rivet \

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

    substituteInPlace bin/rivet-mkhtml-tex \
@@ -109,11 +109,11 @@ stdenv.mkDerivation rec { 
    done

  '';



  meta = with lib; {

  meta = {

    description = "Framework for comparison of experimental measurements from high-energy particle colliders to theory predictions";

    license = licenses.gpl3;

    license = lib.licenses.gpl3;

    homepage = "https://rivet.hepforge.org";

    platforms = platforms.unix;

    maintainers = with maintainers; [ veprbl ];

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ veprbl ];

  };

}

pkgs/by-name/yo/yoda/package.nix

+5 −9
Original line number Diff line number Diff line
@@ -30,20 +30,16 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs =

    [

      python3

    ]

    [ python3 ]

    ++ (with python3.pkgs; [

      numpy

      matplotlib

    ])

    ++ lib.optionals withRootSupport [

      root

    ];

    ++ lib.optionals withRootSupport [ root ];



  propagatedBuildInputs = [

    zlib

  ];

  propagatedBuildInputs = [ zlib ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DWITH_OSX";



  strictDeps = true;

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -17364,10 +17364,6 @@ with pkgs; 
    hepmc = hepmc2;

  };













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













    imagemagick = graphicsmagick-imagemagick-compat;













  };



























  yoda-with-root = lowPrio (yoda.override {















    withRootSupport = true;















  });