python3Packages.django_5: 5.1 -> 5.2 (#416022)
This commit is contained in:
@@ -159,17 +159,8 @@ let
|
||||
python = python312.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
django = final.django_5;
|
||||
|
||||
django-tenants = prev.django-tenants.overrideAttrs {
|
||||
version = "3.7.0-unstable-2025-03-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rissson";
|
||||
repo = "django-tenants";
|
||||
rev = "156e53a6f5902d74b73dd9d0192fffaa2587a740";
|
||||
hash = "sha256-xmhfPgCmcFr5axVV65fCq/AcV8ApRVvFVEpq3cQSVqo=";
|
||||
};
|
||||
};
|
||||
# https://github.com/goauthentik/authentik/pull/14709
|
||||
django = final.django_5_1;
|
||||
|
||||
# Running authentik currently requires a custom version.
|
||||
# Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section.
|
||||
|
||||
@@ -38,7 +38,7 @@ let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
django = prev.django_5;
|
||||
django = prev.django_5_1;
|
||||
|
||||
# tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
|
||||
ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
django = prev.django_5;
|
||||
django = prev.django_5_1;
|
||||
|
||||
django-extensions = prev.django-extensions.overridePythonAttrs {
|
||||
# Compat issues with Django 5.1
|
||||
|
||||
@@ -36,12 +36,12 @@ python.pkgs.buildPythonPackage {
|
||||
django-annoying
|
||||
django-cleanup
|
||||
django-crispy-forms
|
||||
django-crispy-bootstrap4
|
||||
django-tables2
|
||||
djangorestframework
|
||||
drf-writable-nested
|
||||
django-oauth-toolkit
|
||||
bleach
|
||||
crispy-bootstrap4
|
||||
gunicorn
|
||||
lxml
|
||||
markdown
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = final: prev: {
|
||||
django = prev.django_5;
|
||||
# https://github.com/django-crispy-forms/crispy-bootstrap3/issues/12
|
||||
django = prev.django_5_1;
|
||||
djangorestframework = prev.djangorestframework.overridePythonAttrs (old: {
|
||||
# https://github.com/encode/django-rest-framework/discussions/9342
|
||||
disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ];
|
||||
@@ -81,7 +82,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
celery
|
||||
certifi
|
||||
charset-normalizer
|
||||
django-crispy-bootstrap3
|
||||
crispy-bootstrap3
|
||||
cryptography
|
||||
cssselect
|
||||
cython
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-crispy-bootstrap3";
|
||||
pname = "crispy-bootstrap3";
|
||||
version = "2024.1";
|
||||
pyproject = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-crispy-bootstrap4";
|
||||
pname = "crispy-bootstrap4";
|
||||
version = "2024.10";
|
||||
pyproject = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-crispy-bootstrap5";
|
||||
pname = "crispy-bootstrap5";
|
||||
version = "2025.6";
|
||||
pyproject = true;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
setuptools,
|
||||
wheel,
|
||||
# dependencies
|
||||
django_5,
|
||||
django,
|
||||
apscheduler,
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
django_5
|
||||
django
|
||||
apscheduler
|
||||
];
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
django_5_2,
|
||||
django,
|
||||
psycopg,
|
||||
python-dateutil,
|
||||
}:
|
||||
@@ -21,8 +21,12 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"django"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
django_5_2
|
||||
django
|
||||
psycopg
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
@@ -196,6 +196,9 @@ mapAliases ({
|
||||
django_compat = django-compat; # added 2023-07-25
|
||||
django-compat = throw "django-compat has been removed. It provided forward/backport compat for django 1.x, which is long end of life."; # added 2023-07-26
|
||||
django_contrib_comments = django-contrib-comments; # added 2023-07-25
|
||||
django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
|
||||
django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
|
||||
django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
|
||||
django-crontab = throw "django-crontabe has been removed beacause it is unmaintained since 2018"; # added 2024-08-21
|
||||
django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21
|
||||
django_environ = django-environ; # added 2021-12-25
|
||||
|
||||
@@ -2990,6 +2990,12 @@ self: super: with self; {
|
||||
|
||||
credstash = callPackage ../development/python-modules/credstash { };
|
||||
|
||||
crispy-bootstrap3 = callPackage ../development/python-modules/crispy-bootstrap3 { };
|
||||
|
||||
crispy-bootstrap4 = callPackage ../development/python-modules/crispy-bootstrap4 { };
|
||||
|
||||
crispy-bootstrap5 = callPackage ../development/python-modules/crispy-bootstrap5 { };
|
||||
|
||||
crochet = callPackage ../development/python-modules/crochet { };
|
||||
|
||||
crocoddyl = toPythonModule (
|
||||
@@ -3748,12 +3754,6 @@ self: super: with self; {
|
||||
|
||||
django-countries = callPackage ../development/python-modules/django-countries { };
|
||||
|
||||
django-crispy-bootstrap3 = callPackage ../development/python-modules/django-crispy-bootstrap3 { };
|
||||
|
||||
django-crispy-bootstrap4 = callPackage ../development/python-modules/django-crispy-bootstrap4 { };
|
||||
|
||||
django-crispy-bootstrap5 = callPackage ../development/python-modules/django-crispy-bootstrap5 { };
|
||||
|
||||
django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { };
|
||||
|
||||
django-crossdomainmedia = callPackage ../development/python-modules/django-crossdomainmedia { };
|
||||
@@ -4015,8 +4015,7 @@ self: super: with self; {
|
||||
|
||||
django_4 = callPackage ../development/python-modules/django/4.nix { };
|
||||
|
||||
# Pre-release
|
||||
django_5 = self.django_5_1;
|
||||
django_5 = self.django_5_2;
|
||||
|
||||
django_5_1 = callPackage ../development/python-modules/django/5_1.nix { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user