colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #300767 from mweinelt/django-py312-aarch64-linux 

[staging-next] Fix python312Packages.django_{4,5} on aarch64-linux
This commit is contained in:
Martin Weinelt 2024-04-01 22:27:01 +02:00 committed by GitHub
parent 11fd36353e dc9aaedc99
commit 2373d86b7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/django/4.nix
View File

@ -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 = [

6
pkgs/development/python-modules/django/5.nix
View File

@ -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 = [

5
pkgs/servers/home-assistant/default.nix
View File

@ -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 {