e11sync

commit 1d0edddc9ea73fcf77b314705b8acb941ba4e446 (tree)
parent 8fdea63c59fe2149e50685f41d8ada9e4eb7acb3
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Sun, 28 Jan 2024 18:40:11 +0200

move overlays to overlays/

Diffstat:
M
flake.nix
 | 
4
++--
M
modules/e11sync/default.nix
 | 
2
+-
D
overlay.nix
 | 
13
-------------
A
overlays/default.nix
 | 
13
+++++++++++++
R
django5.nix -> overlays/django5.nix
 | 
0

5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -35,12 +35,12 @@
     geoip2-tarball,
     ...
   }: let
-    overlay = import ./overlay.nix geoip2-tarball;
+    overlay = import ./overlays/default.nix geoip2-tarball;
   in
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {
         inherit system;
-        overlays = [overlay (import ./django5.nix)];
+        overlays = [overlay (import ./overlays/django5.nix)];
       };
     in {
       packages = {
diff --git a/modules/e11sync/default.nix b/modules/e11sync/default.nix
@@ -4,7 +4,7 @@ geoip2-tarball: {
   pkgs,
   ...
 }: let
-  overlay = import ../../overlay.nix geoip2-tarball;
+  overlay = import ../../overlays/default.nix geoip2-tarball;
   pkgs1 = pkgs.extend overlay;
   inherit (pkgs1) e11sync-backend e11sync-caddyfile;
 in {
diff --git a/overlay.nix b/overlay.nix
@@ -1,13 +0,0 @@
-geoip2-tarball: let
-  django5 = import ./django5.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 {};
-  }
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -0,0 +1,13 @@
+geoip2-tarball: let
+  django5 = import ./django5.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 {};
+  }
diff --git a/django5.nix b/overlays/django5.nix