summary refs log tree commit diff
path: root/pkgs/development/libraries/physics
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-25 06:01:06 +0000
committerGitHub <noreply@github.com>2021-11-25 06:01:06 +0000
commitfa1a61b8a280770394a17d50ed3b6cc4b238adc2 (patch)
treef1042a970998bd087466636d714fba72e5a12b85 /pkgs/development/libraries/physics
parentb244d0edca2b2046c6d8b195ba43c54e92294695 (diff)
parent2d461423f7abcd7df24eedb2610fe19e4fcf130b (diff)
downloadnixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.tar
nixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.tar.gz
nixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.tar.bz2
nixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.tar.lz
nixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.tar.xz
nixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.tar.zst
nixpkgs-fa1a61b8a280770394a17d50ed3b6cc4b238adc2.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/physics')
-rw-r--r--pkgs/development/libraries/physics/yoda/default.nix16
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index e23f7aaadd9..fc8a07aa2b8 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,22 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    hash = "sha256-zb7j7fBMv2brJ+gUMMDTKFEJDC2embENe3wXdx0VTOA=";
+    hash = "sha256-XRUYL7gAoNX/ykdD+CwpXsYu5yzz5GJbZNAIP/+gR98=";
   };
 
-  patches = [
-    # Prevent ROOT from initializing X11 or Cocoa (helps with sandboxing)
-    (fetchpatch {
-      url = "https://gitlab.com/hepcedar/yoda/-/commit/36c035f4f0385dec58702f09564ca66a14ca2c3e.diff";
-      sha256 = "sha256-afB+y33TVNJtxY5As18EcutJEGDE4g0UzMxzA+YgICk=";
-      excludes = [ "ChangeLog" ];
-    })
-  ];
-
   nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
   buildInputs = [ python ]
     ++ (with python.pkgs; [ numpy matplotlib ])
@@ -41,11 +32,10 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
   installCheckTarget = "check";
-  enableParallelChecking = false; # testreader consumes output of testwriter
 
   meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     homepage = "https://yoda.hepforge.org";
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ veprbl ];