summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2026-01-18 23:36:51 +0000
committerGitHub <noreply@github.com>2026-01-18 23:36:51 +0000
commitcb1d39a0efb72f87f86f218f1fa0dc3a6ee9c79a (patch)
treed3e2f770527c800395312b8c8bc6a05cc3f3c43c
parent49213403e38ca893cafc83571d05bebbb782ff89 (diff)
parent6d12786889039ad727a71863303a978dcc3706af (diff)
treewide: replace django_5_2 with django_5 (#481441)
-rw-r--r--pkgs/by-name/au/authentik/package.nix2
-rw-r--r--pkgs/by-name/gl/glitchtip/package.nix2
-rw-r--r--pkgs/by-name/la/lasuite-docs/package.nix2
-rw-r--r--pkgs/by-name/la/lasuite-meet/package.nix2
-rw-r--r--pkgs/by-name/ne/netbox_4_3/package.nix2
-rw-r--r--pkgs/by-name/ne/netbox_4_4/package.nix2
-rw-r--r--pkgs/by-name/pa/paperless-ngx/package.nix2
-rw-r--r--pkgs/by-name/pe/peering-manager/package.nix2
-rw-r--r--pkgs/by-name/pr/pretalx/package.nix2
-rw-r--r--pkgs/by-name/we/weblate/package.nix2
-rw-r--r--pkgs/development/python-modules/django/5.nix (renamed from pkgs/development/python-modules/django/5_2.nix)0
-rw-r--r--pkgs/top-level/python-aliases.nix1
-rw-r--r--pkgs/top-level/python-packages.nix4
13 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index d88476a32a9a..adc0aa587bc7 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -206,7 +206,7 @@ let
self = python;
packageOverrides = final: prev: {
# https://github.com/goauthentik/authentik/pull/16324
- django = final.django_5_2;
+ django = final.django_5;
django-channels-postgres = final.buildPythonPackage {
pname = "django-channels-postgres";
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 89aecb2f3bb8..5d3296e72f88 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -13,7 +13,7 @@ let
python = python313.override {
self = python;
packageOverrides = final: prev: {
- django = final.django_5_2;
+ django = final.django_5;
django-csp = prev.django-csp.overridePythonAttrs rec {
version = "4.0";
src = fetchPypi {
diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix
index 3be6d11eec1d..7a5c134d6061 100644
--- a/pkgs/by-name/la/lasuite-docs/package.nix
+++ b/pkgs/by-name/la/lasuite-docs/package.nix
@@ -13,7 +13,7 @@ let
python = python3.override {
self = python3;
packageOverrides = self: super: {
- django = super.django_5_2;
+ django = super.django_5;
};
};
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index 4498801eb593..674507684ea7 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -7,7 +7,7 @@
let
python = python3.override {
self = python3;
- packageOverrides = (self: super: { django = super.django_5_2; });
+ packageOverrides = (self: super: { django = super.django_5; });
};
in
diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix
index dc5807639598..3689a4177415 100644
--- a/pkgs/by-name/ne/netbox_4_3/package.nix
+++ b/pkgs/by-name/ne/netbox_4_3/package.nix
@@ -9,7 +9,7 @@
let
py = python3.override {
self = py;
- packageOverrides = _final: prev: { django = prev.django_5_2; };
+ packageOverrides = _final: prev: { django = prev.django_5; };
};
extraBuildInputs = plugins py.pkgs;
diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix
index 01ee99b882e6..1a6bea9d66bf 100644
--- a/pkgs/by-name/ne/netbox_4_4/package.nix
+++ b/pkgs/by-name/ne/netbox_4_4/package.nix
@@ -9,7 +9,7 @@
let
py = python3.override {
self = py;
- packageOverrides = _final: prev: { django = prev.django_5_2; };
+ packageOverrides = _final: prev: { django = prev.django_5; };
};
extraBuildInputs = plugins py.pkgs;
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 9a03cf6d1722..4a2746ae109c 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -42,7 +42,7 @@ let
python = python3.override {
self = python;
packageOverrides = final: prev: {
- django = prev.django_5_2;
+ django = prev.django_5;
fido2 = prev.fido2.overridePythonAttrs {
version = "1.2.0";
diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix
index bab7c5c14e7a..8534577e3529 100644
--- a/pkgs/by-name/pe/peering-manager/package.nix
+++ b/pkgs/by-name/pe/peering-manager/package.nix
@@ -10,7 +10,7 @@
let
python = python3.override {
packageOverrides = final: prev: {
- django = prev.django_5_2;
+ django = prev.django_5;
};
};
in
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index c9db67140ba9..c15867c1ca82 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -12,7 +12,7 @@ let
python = python3.override {
self = python;
packageOverrides = final: prev: {
- django = prev.django_5_2;
+ django = prev.django_5;
django-countries = prev.django-countries.overridePythonAttrs (oldAttrs: rec {
version = "8.1.0";
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 91231da9b554..04749c37a459 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -18,7 +18,7 @@
let
python = python3.override {
packageOverrides = final: prev: {
- django = prev.django_5_2;
+ django = prev.django_5;
};
};
in
diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5.nix
index d35469b1af38..d35469b1af38 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5.nix
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9685d224e6d8..42dec1460948 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -120,6 +120,7 @@ mapAliases {
django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
django_3 = throw "Django 3 has reached it's EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
django_5_1 = throw "Django 5.1 has reached it's EOL in 2025-12 and has therefore been removed."; # added 2025-11-30"
+ django_5_2 = django_5; # added 2026-01-18
django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29
django_classytags = throw "'django_classytags' has been renamed to/replaced by 'django-classy-tags'"; # Converted to throw 2025-10-29
django_colorful = throw "'django_colorful' has been renamed to/replaced by 'django-colorful'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 90f87b9925e5..23bf968e1134 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4368,9 +4368,7 @@ self: super: with self; {
# LTS in extended support phase
django_4 = callPackage ../development/python-modules/django/4.nix { };
- django_5 = self.django_5_2;
-
- django_5_2 = callPackage ../development/python-modules/django/5_2.nix { };
+ django_5 = callPackage ../development/python-modules/django/5.nix { };
djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { };