diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-05-26 15:52:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 15:52:08 -0400 |
| commit | 5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1 (patch) | |
| tree | 24bf9e531f000f858816ea7d870ff61945b6bc1b /pkgs/top-level/all-packages.nix | |
| parent | 75e8502e8f3397f539d00dade590159a4f6c6e6f (diff) | |
| parent | 475d5df12a19e8de4bc99a49bef81e37d7a57a34 (diff) | |
| download | nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.tar nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.tar.gz nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.tar.bz2 nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.tar.lz nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.tar.xz nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.tar.zst nixlib-5035c65a600b5a8fbea10c41b41b7bd52c4a3ef1.zip | |
Merge pull request #88476 from veprbl/pr/rivet3
rivet: 2.7.2 -> 3.1.1
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bfa2b48da3f..2a5f349e9dd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25300,8 +25300,6 @@ in lhapdf = callPackage ../development/libraries/physics/lhapdf { }; - mcgrid = callPackage ../development/libraries/physics/mcgrid { }; - mela = callPackage ../development/libraries/physics/mela { }; nlojet = callPackage ../development/libraries/physics/nlojet { }; @@ -25309,13 +25307,14 @@ in pythia = callPackage ../development/libraries/physics/pythia { }; rivet = callPackage ../development/libraries/physics/rivet { + hepmc = hepmc2; imagemagick = graphicsmagick-imagemagick-compat; }; thepeg = callPackage ../development/libraries/physics/thepeg { }; yoda = callPackage ../development/libraries/physics/yoda { - python = python2; + python = python3; }; yoda-with-root = lowPrio (yoda.override { withRootSupport = true; |