diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-31 08:36:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-31 08:36:42 +0200 |
commit | 66f4630924026cae4effcc51420ae09b88b63ee2 (patch) | |
tree | 8cbb32ea28d019f459ee25207c9388de79eba71f | |
parent | ccd3f9804d846013b1fba04dab8e001ef3354c86 (diff) | |
parent | 4342d99d82deee4920ed9b0ee9a44957e23a5fa9 (diff) | |
download | nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.tar nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.tar.gz nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.tar.bz2 nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.tar.lz nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.tar.xz nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.tar.zst nixlib-66f4630924026cae4effcc51420ae09b88b63ee2.zip |
Merge pull request #41283 from veprbl/pr/herwig_7.1.3
herwig 7.1.3
-rw-r--r-- | pkgs/development/libraries/physics/herwig/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/physics/thepeg/default.nix | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index f3ba8a4a6ff6..ce6ea4c56a89 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i"; + sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 63db874d8480..0a84fe20da72 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va"; + sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; configureFlags = [ "--with-hepmc=${hepmc}" + "--with-rivet=${rivet}" "--without-javagui" ]; |