summary refs log tree commit diff
path: root/pkgs/development/libraries/physics
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2018-12-11 12:49:48 +0100
committerGitHub <noreply@github.com>2018-12-11 12:49:48 +0100
commit4d34cfcd960d62070696dff314d2e4d10a255559 (patch)
tree1bce027787b4df368b3d360305d8b64d26c57298 /pkgs/development/libraries/physics
parentb960d1ab0bf1a22707f8aeba0af582d16cf91a6a (diff)
parent99d4e656c57a25709cae11d62fa7f2b605dd9a9f (diff)
downloadnixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.tar
nixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.tar.gz
nixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.tar.bz2
nixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.tar.lz
nixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.tar.xz
nixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.tar.zst
nixpkgs-4d34cfcd960d62070696dff314d2e4d10a255559.zip
Merge pull request #51851 from veprbl/pr/rivet_bump
rivet: 2.6.1 -> 2.6.2
Diffstat (limited to 'pkgs/development/libraries/physics')
-rw-r--r--pkgs/development/libraries/physics/rivet/default.nix6
-rw-r--r--pkgs/development/libraries/physics/yoda/default.nix4
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 639da1687a7..30f8ad8e8a3 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rivet-${version}";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    sha256 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474";
+    sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx";
   };
 
   patches = [
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
 
   preConfigure = ''
-    substituteInPlace Makefile.in \
-      --replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test"
     substituteInPlace analyses/Makefile.in \
       --replace "!(tmp)" ""
     substituteInPlace bin/rivet-buildplugin.in \
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 664d1fa601e..6e4ffb9745d 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "0n40qii2ych5yfx6drj79b3rk29dvc3gysjqs719qgl26d3hkxpb";
+    sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71";
   };
 
   pythonPath = []; # python wrapper support