mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #51851 from veprbl/pr/rivet_bump
rivet: 2.6.1 -> 2.6.2
This commit is contained in:
commit
4d34cfcd96
2 changed files with 4 additions and 6 deletions
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rivet-${version}";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
|
||||
sha256 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474";
|
||||
sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
|
|||
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test"
|
||||
substituteInPlace analyses/Makefile.in \
|
||||
--replace "!(tmp)" ""
|
||||
substituteInPlace bin/rivet-buildplugin.in \
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yoda-${version}";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
|
||||
sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb";
|
||||
sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71";
|
||||
};
|
||||
|
||||
pythonPath = []; # python wrapper support
|
||||
|
|
Loading…
Reference in a new issue