From c38f096db8d5ce33663c1d36e8d7ac7816a5b591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 28 Jan 2024 18:27:00 +0200
Subject: [PATCH] overlay.nix: cleanup

---
 overlay.nix | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 7250e9a..43f7ca8 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,20 +1,19 @@
-geoip2-tarball: (_: prev: let
-  withDjango5 = prev.extend (
-    _: prev1: {
-      python3 = prev1.python3.override {
-        packageOverrides = _: python-prev: {
-          django = python-prev.django_5;
-        };
+geoip2-tarball: let
+  django5 = _: prev: {
+    python3 = prev.python3.override {
+      packageOverrides = _: python-prev: {
+        django = python-prev.django_5;
       };
-    }
-  );
-in {
-  geoip-mmdb = withDjango5.callPackage ./pkgs/geoip-mmdb.nix {
-    inherit geoip2-tarball;
+    };
   };
-  e11sync-blog = withDjango5.callPackage ./pkgs/e11sync-blog.nix {};
-  e11sync-static = withDjango5.callPackage ./pkgs/e11sync-static.nix {};
-  e11sync-djangostatic = withDjango5.callPackage ./pkgs/e11sync-djangostatic.nix {};
-  e11sync-caddyfile = withDjango5.callPackage ./pkgs/e11sync-caddyfile.nix {};
-  e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {};
-})
+in
+  _: prev: {
+    geoip-mmdb = (prev.extend django5).callPackage ./pkgs/geoip-mmdb.nix {
+      inherit geoip2-tarball;
+    };
+    e11sync-blog = (prev.extend django5).callPackage ./pkgs/e11sync-blog.nix {};
+    e11sync-static = (prev.extend django5).callPackage ./pkgs/e11sync-static.nix {};
+    e11sync-djangostatic = (prev.extend django5).callPackage ./pkgs/e11sync-djangostatic.nix {};
+    e11sync-caddyfile = (prev.extend django5).callPackage ./pkgs/e11sync-caddyfile.nix {};
+    e11sync-backend = (prev.extend django5).callPackage ./pkgs/e11sync-backend.nix {};
+  }