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

Merge pull request #51851 from veprbl/pr/rivet_bump

Browse Source 
rivet: 2.6.1 -> 2.6.2
This commit is contained in:
Sarah Brofeldt 2018-12-11 12:49:48 +01:00 committed by GitHub
commit 4d34cfcd96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rivet-${version}"; name = "rivet-${version}";
version = "2.6.1"; version = "2.6.2";
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 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474"; sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx";
}; };
patches = [ patches = [
@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
preConfigure = '' 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 \ substituteInPlace analyses/Makefile.in \
--replace "!(tmp)" "" --replace "!(tmp)" ""
substituteInPlace bin/rivet-buildplugin.in \ substituteInPlace bin/rivet-buildplugin.in \

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yoda-${version}"; name = "yoda-${version}";
version = "1.7.3"; version = "1.7.4";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb"; sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71";
}; };
pythonPath = []; # python wrapper support pythonPath = []; # python wrapper support