summary refs log tree commit diff
path: root/pkgs/development/libraries/physics
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2022-06-05 12:01:35 -0400
committerGitHub <noreply@github.com>2022-06-05 12:01:35 -0400
commitec6dd63f838dc264d69409a0193d1127feeaefd1 (patch)
treefd28cfac628b0f6f8a2e5936d144d937df565957 /pkgs/development/libraries/physics
parenta83de8a692136e605872f9bd43f2c137414bea62 (diff)
parentd2144c1e0cce513807d15979eb9844386cd16ccc (diff)
downloadnixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.tar
nixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.tar.gz
nixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.tar.bz2
nixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.tar.lz
nixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.tar.xz
nixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.tar.zst
nixpkgs-ec6dd63f838dc264d69409a0193d1127feeaefd1.zip
Merge pull request #172935 from veprbl/pr/rivet_3_1_6
rivet: 3.1.5 -> 3.1.6
Diffstat (limited to 'pkgs/development/libraries/physics')
-rw-r--r--pkgs/development/libraries/physics/rivet/default.nix13
-rw-r--r--pkgs/development/libraries/physics/yoda/default.nix4
2 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 9739530f8ba..1b97997c5c1 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,22 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rivet";
-  version = "3.1.5";
+  version = "3.1.6";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo=";
+    hash = "sha256-HPbrtqedGBxEHR0MfG1iPEI4F8YQk/NvIa2q4j5nkJA=";
   };
 
-  patches = [
-    # Fixes build
-    (fetchpatch {
-      name = "rivet-3.1.5-namespace-fix.patch";
-      url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff";
-      sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms=";
-    })
-  ];
-
   latex = texlive.combine { inherit (texlive)
     scheme-basic
     collection-pstricks
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index a2bb09b58a2..db7c18a3344 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    hash = "sha256-KifrhuZH11szennCDC2sJeHxO9JZJbnJWuKK3JN5NwU=";
+    hash = "sha256-WRkaDpr6jbU/+qIHn4Uy5bE94b5iJwPW9wYNNhBSi2s=";
   };
 
   nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];