django_5: override globally

2024-01-16 00:34:11 +02:00
parent bbac4f96b4
commit 994a4ad18b
4 changed files with 21 additions and 22 deletions
--- a/pkgs/e11sync-backend.nix
+++ b/pkgs/e11sync-backend.nix
@@ -14,22 +14,13 @@
 }:
 stdenv.mkDerivation {
  name = "e11sync";
-  propagatedBuildInputs = let
-    pythonEnv =
-      (python3.override
-        {
-          packageOverrides = _: super: {
-            django = super.django_5;
-          };
-        })
-      .withPackages (ps:
-        with ps; [
-          django
-          django-compressor
-          geoip2
-        ]);
-  in [
-    pythonEnv
+  propagatedBuildInputs = [
+    (python3.withPackages
+      (ps: [
+        ps.django
+        ps.django-compressor
+        ps.geoip2
+      ]))
    libmaxminddb
  ];
  nativeBuildInputs = [makeWrapper];
@@ -59,7 +50,7 @@ stdenv.mkDerivation {
    runCommand "e11sync-test" {
      src = ../app;
      buildInputs = [
-        python3Packages.django_5
+        python3Packages.django
        python3Packages.django-compressor
        python3Packages.geoip2
        dart-sass
--- a/pkgs/e11sync-static.nix
+++ b/pkgs/e11sync-static.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  name = "e11sync-static";
  src = ../app;
  nativeBuildInputs = [
-    python3Packages.django_5
+    python3Packages.django
    python3Packages.django-compressor
    dart-sass
  ];