alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

herwig: 7.0.4 -> 7.1.1, thepeg: 2.0.3 -> 2.1.1

Browse source
This commit is contained in:
Dmitry Kalinkin 2017-07-14 20:46:00 -04:00
parent 459e3864d2
commit 6bcc20361f
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/physics/herwig/default.nix
View file

@ -2,31 +2,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "herwig-${version}"; name = "herwig-${version}";
version = "7.0.4"; version = "7.1.1";
src = fetchurl { src = fetchurl {
url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6"; sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j";
}; };
patches = [
# Otherwise it causes an error
# lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_
(fetchpatch {
url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw";
sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83";
})
];
nativeBuildInputs = [ autoconf automake libtool ]; nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] buildInputs = [ boost fastjet gfortran gsl thepeg zlib ]
# There is a bug that requires for MMHT PDF's to be presend during the build # There is a bug that requires for MMHT PDF's to be presend during the build
++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
preConfigure = '' postPatch = ''
# needed for the patch above patchShebangs ./cat_with_cpplines
autoreconf -i
''; '';
configureFlags = [ configureFlags = [

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "thepeg-${version}"; name = "thepeg-${version}";
version = "2.0.3"; version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5"; sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71";
}; };
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];