BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45044 from veprbl/pr/rivet_271_bump

Browse source 
rivet: 2.7.0 -> 2.7.1
This commit is contained in:
xeji 2018-08-15 21:35:59 +02:00 committed by GitHub
commit 3f59f828d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/physics/rivet/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "rivet-${version}";
version = "2.6.0";
version = "2.6.1";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv";
sha256 = "0ybv5dl3blgk9p9ayhknirxb6504kpygnkmizd5dr9ippys1i3c8";
};
patches = [
@ -28,6 +28,10 @@ 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 \
--replace '"which"' '"${which}/bin/which"' \
--replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \

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

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