diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-12-16 05:26:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-16 05:26:52 -0500 |
commit | 83c5184398d57181ffe722876f4c807e098a0b49 (patch) | |
tree | e5c95306e62a13b5a6b2596b37f4e75977140f02 | |
parent | cc92da030283faf7f3388793a5a77829ff62da06 (diff) | |
parent | 95b0bc0989fc579a879c51c8ec03cafe1a4b8e68 (diff) | |
download | nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.tar nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.tar.gz nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.tar.bz2 nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.tar.lz nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.tar.xz nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.tar.zst nixpkgs-83c5184398d57181ffe722876f4c807e098a0b49.zip |
Merge pull request #75734 from veprbl/pr/herwig_7_2_0
herwig: 7.1.6 -> 7.2.0
-rw-r--r-- | pkgs/development/libraries/physics/herwig/default.nix | 20 | ||||
-rw-r--r-- | pkgs/development/libraries/physics/thepeg/default.nix | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 367d0813f4e..d52f92d9639 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.1.6"; + version = "7.2.0"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "0h4gcmwnk4iyd31agzcq3p8bvlrgc8svm4ymzqgvvhizwflqf3yr"; + sha256 = "0r5iyai2j99pk9p36g4rp98bxm55zd1ik9kgm2zf5zgpvxfm8csr"; }; nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] - # There is a bug that requires for MMHT PDF's to be presend during the build - ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); + # There is a bug that requires for default PDF's to be present during the build + ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]); postPatch = '' patchShebangs ./ @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A multi-purpose particle physics event generator"; - license = stdenv.lib.licenses.gpl2; - homepage = https://herwig.hepforge.org/; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... + homepage = https://herwig.hepforge.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; + broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... }; } diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 82cf2c3a2e8..15c94668581 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.1.6"; + version = "2.2.0"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0krz6psr69kn48xkgr0mjadmzvq572mzn02inlasiz3bf61izrf1"; + sha256 = "1y7vwsc4zk629np4rpjh7a8qzvyqc2fixnwq98dgdndp2544gqfk"; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Toolkit for High Energy Physics Event Generation"; - license = stdenv.lib.licenses.gpl2; - homepage = https://herwig.hepforge.org/; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + homepage = https://herwig.hepforge.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; }; } |