Merge branch 'master'

This commit is contained in:
Vladimír Čunát
2018-03-05 12:49:52 +01:00
1666 changed files with 26733 additions and 31238 deletions

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "herwig-${version}";
version = "7.1.1";
version = "7.1.2";
src = fetchurl {
url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j";
sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i";
};
nativeBuildInputs = [ autoconf automake libtool ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pythia-${version}";
version = "8.219";
version = "8.226";
src = fetchurl {
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
sha256 = "13fhphddl0jir8jyjvj6a9qz14wiv02q9lby8mcdyv8gsw0ir8hy";
sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g";
};
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];

View File

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