1 files changed, 79 insertions, 66 deletions

diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix
index 064899b8e78eb..c8b2bae7cea6e 100644
--- a/pkgs/development/python-modules/devito/default.nix
+++ b/pkgs/development/python-modules/devito/default.nix
@@ -1,32 +1,32 @@
-{ lib
-, stdenv
-, anytree
-, buildPythonPackage
-, cached-property
-, cgen
-, click
-, codepy
-, distributed
-, fetchFromGitHub
-, gcc
-, llvmPackages
-, matplotlib
-, multidict
-, nbval
-, psutil
-, py-cpuinfo
-, pyrevolve
-, pytest-xdist
-, pytestCheckHook
-, pythonOlder
-, pythonRelaxDepsHook
-, scipy
-, sympy
+{
+  lib,
+  stdenv,
+  anytree,
+  buildPythonPackage,
+  cached-property,
+  cgen,
+  click,
+  codepy,
+  distributed,
+  fetchFromGitHub,
+  gcc,
+  llvmPackages,
+  matplotlib,
+  multidict,
+  nbval,
+  psutil,
+  py-cpuinfo,
+  pytest-xdist,
+  pytestCheckHook,
+  pythonOlder,
+  pythonRelaxDepsHook,
+  scipy,
+  sympy,
 }:
 
 buildPythonPackage rec {
   pname = "devito";
-  version = "4.8.3";
+  version = "4.8.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "devitocodes";
     repo = "devito";
     rev = "refs/tags/v${version}";
-    hash = "sha256-g9rRJF1JrZ6+s3tj4RZHuGOjt5LJjtK9I5CJmq4CJL4=";
+    hash = "sha256-unuJLp+zTyGpOk5O78xYbW6Zrzp60WyqgT9mf2YpTG4=";
   };
 
   pythonRemoveDeps = [
@@ -47,11 +47,9 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = true;
 
-  nativeBuildInputs = [
-    pythonRelaxDepsHook
-  ];
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     anytree
     cached-property
     cgen
@@ -62,12 +60,9 @@ buildPythonPackage rec {
     multidict
     psutil
     py-cpuinfo
-    pyrevolve
     scipy
     sympy
-  ] ++ lib.optionals stdenv.cc.isClang [
-    llvmPackages.openmp
-  ];
+  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   nativeCheckInputs = [
     gcc
@@ -80,40 +75,58 @@ buildPythonPackage rec {
 
   # I've had to disable the following tests since they fail while using nix-build, but they do pass
   # outside the build. They mostly related to the usage of MPI in a sandboxed environment.
-  disabledTests = [
-    "test_assign_parallel"
-    "test_cache_blocking_structure_distributed"
-    "test_codegen_quality0"
-    "test_coefficients_w_xreplace"
-    "test_docstrings"
-    "test_docstrings[finite_differences.coefficients]"
-    "test_gs_parallel"
-    "test_if_halo_mpi"
-    "test_if_parallel"
-    "test_init_omp_env_w_mpi"
-    "test_loop_bounds_forward"
-    "test_mpi_nocomms"
-    "test_mpi"
-    "test_index_derivative"
-    "test_new_distributor"
-    "test_setupWOverQ"
-    "test_shortcuts"
-    "test_subdomainset_mpi"
-  ];
+  disabledTests =
+    [
+      "test_assign_parallel"
+      "test_cache_blocking_structure_distributed"
+      "test_codegen_quality0"
+      "test_coefficients_w_xreplace"
+      "test_docstrings"
+      "test_docstrings[finite_differences.coefficients]"
+      "test_gs_parallel"
+      "test_if_halo_mpi"
+      "test_if_parallel"
+      "test_init_omp_env_w_mpi"
+      "test_loop_bounds_forward"
+      "test_mpi_nocomms"
+      "test_mpi"
+      "test_index_derivative"
+      "test_new_distributor"
+      "test_setupWOverQ"
+      "test_shortcuts"
+      "test_subdomainset_mpi"
+      "test_subdomains_mpi"
+    ]
+    ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
+      # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False
+      "test_v0"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # FAILED tests/test_caching.py::TestCaching::test_special_symbols - ValueError: not enough values to unpack (expected 3, got 2)
+      "test_special_symbols"
 
-  disabledTestPaths = [
-    "tests/test_pickle.py"
-    "tests/test_benchmark.py"
-    "tests/test_mpi.py"
-    "tests/test_autotuner.py"
-    "tests/test_data.py"
-    "tests/test_dse.py"
-    "tests/test_gradient.py"
-  ];
+      # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - codepy.CompileError: module compilation failed
+      "test_v0"
+    ]
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+      # Numerical tests
+      "test_lm_fb"
+      "test_lm_ds"
+    ];
 
-  pythonImportsCheck = [
-    "devito"
-  ];
+  disabledTestPaths =
+    [
+      "tests/test_pickle.py"
+      "tests/test_benchmark.py"
+      "tests/test_mpi.py"
+      "tests/test_autotuner.py"
+      "tests/test_data.py"
+      "tests/test_dse.py"
+      "tests/test_gradient.py"
+    ]
+    ++ lib.optionals ((stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin) [ "tests/test_dle.py" ];
+
+  pythonImportsCheck = [ "devito" ];
 
   meta = with lib; {
     description = "Code generation framework for automated finite difference computation";