e11sync

commit 10268c8bfe69278ecd7e772010c16f9efe1f6a66 (tree)
parent 313e30487d93d900abda5120966f3e29f24ce6e5
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Fri, 26 Jan 2024 10:18:46 +0200

fix `nix flake check`

Diffstat:
M
flake.nix
 | 
2
+-
M
modules/e11sync/default.nix
 | 
2
+-
A
overlay.nix
 | 
18
++++++++++++++++++
D
overlays.nix
 | 
18
------------------

4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -35,7 +35,7 @@
     geoip2-tarball,
     ...
   }: let
-    overlay = import ./overlays.nix geoip2-tarball;
+    overlay = import ./overlay.nix geoip2-tarball;
   in
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {
diff --git a/modules/e11sync/default.nix b/modules/e11sync/default.nix
@@ -4,7 +4,7 @@ geoip2-tarball: {
   pkgs,
   ...
 }: let
-  overlay = import ../../overlays.nix geoip2-tarball;
+  overlay = import ../../overlay.nix geoip2-tarball;
   pkgs1 = pkgs.extend overlay;
   inherit (pkgs1) e11sync-backend e11sync-caddyfile;
 in {
diff --git a/overlay.nix b/overlay.nix
@@ -0,0 +1,18 @@
+geoip2-tarball: (_: prev: let
+  withDjango5 = prev.extend (
+    _: prev1: {
+      python3 = prev1.python3.override {
+        packageOverrides = _: python-prev: {
+          django = python-prev.django_5;
+        };
+      };
+    }
+  );
+in {
+  geoip-mmdb = withDjango5.callPackage ./pkgs/geoip-mmdb.nix {
+    inherit geoip2-tarball;
+  };
+  e11sync-static = withDjango5.callPackage ./pkgs/e11sync-static.nix {};
+  e11sync-caddyfile = withDjango5.callPackage ./pkgs/e11sync-caddyfile.nix {};
+  e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {};
+})
diff --git a/overlays.nix b/overlays.nix
@@ -1,18 +0,0 @@
-geoip2-tarball: (_: super: let
-  withDjango5 = super.extend (
-    _: super: {
-      python3 = super.python3.override {
-        packageOverrides = _: python-super: {
-          django = python-super.django_5;
-        };
-      };
-    }
-  );
-in {
-  geoip-mmdb = withDjango5.callPackage ./pkgs/geoip-mmdb.nix {
-    inherit geoip2-tarball;
-  };
-  e11sync-static = withDjango5.callPackage ./pkgs/e11sync-static.nix {};
-  e11sync-caddyfile = withDjango5.callPackage ./pkgs/e11sync-caddyfile.nix {};
-  e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {};
-})