From fc747102592a3cdd6fc89c6e60d6e51d235e8bef Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 13 Jan 2025 12:29:15 +0100
Subject: [PATCH 1/2] python312Packages.mmengine: 0.10.5 -> 0.10.6

Diff: https://github.com/open-mmlab/mmengine/compare/refs/tags/v0.10.5...v0.10.6

Changelog: https://github.com/open-mmlab/mmengine/releases/tag/v0.10.6
---
 .../python-modules/mmengine/default.nix       | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix
index e00be7f18f76..57c56f688f5b 100644
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   setuptools,
@@ -32,31 +30,16 @@
 
 buildPythonPackage rec {
   pname = "mmengine";
-  version = "0.10.5";
+  version = "0.10.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "open-mmlab";
     repo = "mmengine";
     tag = "v${version}";
-    hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k=";
+    hash = "sha256-J9p+JCtNoBlBvvv4p57/DHUIifYs/jdo+pK+paD+iXI=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "mmengine-torch-2.5-compat.patch";
-      url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch";
-      hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A=";
-    })
-    (fetchpatch2 {
-      # Bug reported upstream in https://github.com/open-mmlab/mmengine/issues/1575
-      # PR: https://github.com/open-mmlab/mmengine/pull/1589
-      name = "adapt-to-pytest-breaking-change";
-      url = "https://patch-diff.githubusercontent.com/raw/open-mmlab/mmengine/pull/1589.patch";
-      hash = "sha256-lyKf1GCLOPMpDttJ4s9hbATIGCVkiQhtyLfH9WzMWrw=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -131,7 +114,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ rxiao ];
-    broken =
-      stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
   };
 }

From 0b60aea1a711a29eac554dee552e1ceb113b1f6d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 13 Jan 2025 13:18:25 +0100
Subject: [PATCH 2/2] python312Packages.mmcv: disable failing tests on
 aarch64-linux

---
 .../python-modules/mmcv/default.nix           | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix
index c86ea25b50c0..3f7b5f9f4ce9 100644
--- a/pkgs/development/python-modules/mmcv/default.nix
+++ b/pkgs/development/python-modules/mmcv/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -120,16 +121,23 @@ buildPythonPackage rec {
   # test_cnn test_ops really requires gpus to be useful.
   # some of the tests take exceedingly long time.
   # the rest of the tests are disabled due to sandbox env.
-  disabledTests = [
-    "test_cnn"
-    "test_ops"
-    "test_fileclient"
-    "test_load_model_zoo"
-    "test_processing"
-    "test_checkpoint"
-    "test_hub"
-    "test_reader"
-  ];
+  disabledTests =
+    [
+      "test_cnn"
+      "test_ops"
+      "test_fileclient"
+      "test_load_model_zoo"
+      "test_processing"
+      "test_checkpoint"
+      "test_hub"
+      "test_reader"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # flaky numerical tests (AssertionError)
+      "test_ycbcr2rgb"
+      "test_ycbcr2bgr"
+      "test_tensor2imgs"
+    ];
 
   meta = {
     description = "Foundational Library for Computer Vision Research";