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

Merge pull request #75734 from veprbl/pr/herwig_7_2_0

Browse Source 
herwig: 7.1.6 -> 7.2.0
This commit is contained in:
Dmitry Kalinkin 2019-12-16 05:26:52 -05:00 committed by GitHub
commit 83c5184398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/physics/herwig/default.nix
View File

@ -2,18 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "herwig"; pname = "herwig";
version = "7.1.6"; version = "7.2.0";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
sha256 = "0h4gcmwnk4iyd31agzcq3p8bvlrgc8svm4ymzqgvvhizwflqf3yr"; sha256 = "0r5iyai2j99pk9p36g4rp98bxm55zd1ik9kgm2zf5zgpvxfm8csr";
}; };
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 default PDF's to be present during the build
++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]);
postPatch = '' postPatch = ''
patchShebangs ./ patchShebangs ./
@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "A multi-purpose particle physics event generator"; description = "A multi-purpose particle physics event generator";
license = stdenv.lib.licenses.gpl2; homepage = https://herwig.hepforge.org/;
homepage = https://herwig.hepforge.org/; license = licenses.gpl3;
platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ veprbl ];
maintainers = with stdenv.lib.maintainers; [ veprbl ]; platforms = platforms.unix;
broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
}; };
} }

14
pkgs/development/libraries/physics/thepeg/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "thepeg"; pname = "thepeg";
version = "2.1.6"; version = "2.2.0";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
sha256 = "0krz6psr69kn48xkgr0mjadmzvq572mzn02inlasiz3bf61izrf1"; sha256 = "1y7vwsc4zk629np4rpjh7a8qzvyqc2fixnwq98dgdndp2544gqfk";
}; };
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib; {
description = "Toolkit for High Energy Physics Event Generation"; description = "Toolkit for High Energy Physics Event Generation";
license = stdenv.lib.licenses.gpl2; homepage = https://herwig.hepforge.org/;
homepage = https://herwig.hepforge.org/; license = licenses.gpl3;
platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ veprbl ];
maintainers = with stdenv.lib.maintainers; [ veprbl ]; platforms = platforms.unix;
}; };
} }