From 16dfcab9b6191f7984da06762474c79e8cbf42fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 1 Sep 2025 13:57:55 -0700 Subject: [PATCH] python313Packages.mat2: fix broken test --- pkgs/by-name/ma/mat2/package.nix | 7 ++----- pkgs/development/python-modules/mat2/default.nix | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/mat2/package.nix b/pkgs/by-name/ma/mat2/package.nix index ac4f59620916..25c21c612c4f 100644 --- a/pkgs/by-name/ma/mat2/package.nix +++ b/pkgs/by-name/ma/mat2/package.nix @@ -1,9 +1,6 @@ { - # On Python 3.13, `tests/test_libmat2.py::TestCleaning::test_html` fails with - # - # ValueError: The closing tag title doesn't have a corresponding opening one in ./tests/data/clean.html. - python312Packages, + python3Packages, }: -with python312Packages; +with python3Packages; toPythonApplication mat2 diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 164faca0fe6d..19ec148450c4 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -41,6 +41,16 @@ buildPythonPackage rec { url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch"; hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok="; }) + (fetchpatch { + name = "fix-test-on-python313.patch"; + url = "https://0xacab.org/jvoisin/mat2/-/commit/f07344444d6d2f04a1f93e2954f4910b194bee0c.patch"; + hash = "sha256-y756sKkjGO11A2lrRsXAwWgupOZ00u0cDypvkbsiNbY="; + }) + (fetchpatch { + name = "fix-test-on-python312.patch"; + url = "https://0xacab.org/jvoisin/mat2/-/commit/7a8ea224bc327b8ee929379d577c74968ea1c352.patch"; + hash = "sha256-pPiYhoql5WhjhLKvd6y3OnvxORSbXIGCsZMc7UH3i1Q="; + }) # hardcode paths to some binaries (replaceVars ./paths.patch { exiftool = lib.getExe exiftool;