diff --git a/flake.nix b/flake.nix index d7d7e0b..6914883 100644 --- 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 index 1d1431b..345c1ef 100644 --- 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 deleted file mode 100644 index 9c4d103..0000000 --- a/overlay.nix +++ /dev/null @@ -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 new file mode 100644 index 0000000..f841b03 --- /dev/null +++ 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 similarity index 100% rename from django5.nix rename to overlays/django5.nix