From 5f3893140b147526e4b6f8b6835e75b862d58555 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 1 Apr 2024 20:36:58 +0200 Subject: [PATCH 1/3] Revert "home-assistant: disable django_4 tests" This reverts commit f8b4e287b9f144133ab41e2caaa4ef9c4f1febe4. We're instead disabling the failing test on the django derivation. --- pkgs/servers/home-assistant/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1238170a8d9c..797b2ecae5f6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -153,11 +153,6 @@ let doCheck = false; }); - # https://cache.nixos.org/log/srr8kfhx8hzl60hxjpl2vkhbh3y4wmmn-python3.12-django-4.2.11.drv - django_4 = super.django_4.overridePythonAttrs { - doCheck = false; - }; - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "1.3.1"; src = fetchFromGitHub { From 8c820d24f8e98bcd04eb254d52dd7ab57e61159d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 1 Apr 2024 20:38:05 +0200 Subject: [PATCH 2/3] python312Packages.django_4: disable failing test With the revert of xz 5.4.6 (down from 5.6.0) this test started failing on aarch64-linux on Python 3.12. --- pkgs/development/python-modules/django/4.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 029db650ab86..727403f37c46 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , substituteAll @@ -74,6 +75,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/utils_tests/test_autoreload.py \ --replace "/usr/bin/python" "${python.interpreter}" + '' + lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") '' + # Test regression after xz was reverted from 5.6.0 to 5.4.6 + # https://hydra.nixos.org/build/254630990 + substituteInPlace tests/view_tests/tests/test_debug.py \ + --replace-fail "test_files" "dont_test_files" ''; nativeBuildInputs = [ From dc9aaedc99828d95bb287d08763f004f449c01d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 1 Apr 2024 20:51:59 +0200 Subject: [PATCH 3/3] python312Packages.django_5: disable failing test With the revert of xz 5.4.6 (down from 5.6.0) this test started failing on aarch64-linux on Python 3.12. --- pkgs/development/python-modules/django/5.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 2fe896e3bd3d..d359df1c9a45 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , substituteAll @@ -75,6 +76,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tests/utils_tests/test_autoreload.py \ --replace "/usr/bin/python" "${python.interpreter}" + '' + lib.optionalString (pythonAtLeast "3.12" && stdenv.hostPlatform.system == "aarch64-linux") '' + # Test regression after xz was reverted from 5.6.0 to 5.4.6 + # https://hydra.nixos.org/build/254532197 + substituteInPlace tests/view_tests/tests/test_debug.py \ + --replace-fail "test_files" "dont_test_files" ''; nativeBuildInputs = [