Skip to content

[staging-next] Fix python312Packages.django_{4,5} on aarch64-linux #300767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mweinelt merged 3 commits into from
Apr 1, 2024
Merged

[staging-next] Fix python312Packages.django_{4,5} on aarch64-linux #300767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f38931
Revert "home-assistant: disable django_4 tests"
mweinelt Apr 1, 2024
8c820d2
python312Packages.django_4: disable failing test
mweinelt Apr 1, 2024
dc9aaed
python312Packages.django_5: disable failing test
mweinelt Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/django/4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, pythonOlder
, substituteAll

Expand Down Expand Up @@ -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 = [
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/django/5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, stdenv
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, pythonOlder
, substituteAll

Expand Down Expand Up @@ -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 = [
Expand Down
5 changes: 0 additions & 5 deletions pkgs/servers/home-assistant/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down