1

move overlays to overlays/

This commit is contained in:
Motiejus Jakštys 2024-01-28 18:40:11 +02:00
parent 8fdea63c59
commit 1d0edddc9e
5 changed files with 16 additions and 16 deletions

View File

@ -35,12 +35,12 @@
geoip2-tarball, geoip2-tarball,
... ...
}: let }: let
overlay = import ./overlay.nix geoip2-tarball; overlay = import ./overlays/default.nix geoip2-tarball;
in in
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [overlay (import ./django5.nix)]; overlays = [overlay (import ./overlays/django5.nix)];
}; };
in { in {
packages = { packages = {

View File

@ -4,7 +4,7 @@ geoip2-tarball: {
pkgs, pkgs,
... ...
}: let }: let
overlay = import ../../overlay.nix geoip2-tarball; overlay = import ../../overlays/default.nix geoip2-tarball;
pkgs1 = pkgs.extend overlay; pkgs1 = pkgs.extend overlay;
inherit (pkgs1) e11sync-backend e11sync-caddyfile; inherit (pkgs1) e11sync-backend e11sync-caddyfile;
in { in {

View File

@ -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 {};
}

13
overlays/default.nix Normal file
View File

@ -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 {};
}