e11sync.overlay: expose a non-list
This commit is contained in:
parent
9bc1db9fe0
commit
5c957684e4
|
@ -35,11 +35,12 @@
|
|||
geoip2-tarball,
|
||||
...
|
||||
}: let
|
||||
overlays = import ./overlays.nix geoip2-tarball;
|
||||
overlay = import ./overlays.nix geoip2-tarball;
|
||||
in
|
||||
flake-utils.lib.eachDefaultSystem (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
inherit system;
|
||||
overlays = [overlay];
|
||||
};
|
||||
in {
|
||||
packages = {
|
||||
|
@ -127,6 +128,6 @@
|
|||
};
|
||||
nixosModules.e11sync = import ./modules/e11sync geoip2-tarball;
|
||||
|
||||
overlays.default = overlays;
|
||||
overlays.default = overlay;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,8 +4,8 @@ geoip2-tarball: {
|
|||
pkgs,
|
||||
...
|
||||
}: let
|
||||
overlays = import ../../overlays.nix geoip2-tarball;
|
||||
pkgs1 = pkgs.extend (lib.composeManyExtensions overlays);
|
||||
overlay = import ../../overlays.nix geoip2-tarball;
|
||||
pkgs1 = pkgs.extend overlay;
|
||||
inherit (pkgs1) e11sync-backend e11sync-frontend;
|
||||
in {
|
||||
options.e11sync = with lib.types; {
|
||||
|
|
36
overlays.nix
36
overlays.nix
|
@ -1,20 +1,18 @@
|
|||
geoip2-tarball: [
|
||||
(_: super: let
|
||||
withDjango5 = super.extend (
|
||||
_: super: {
|
||||
python3 = super.python3.override {
|
||||
packageOverrides = _: python-super: {
|
||||
django = python-super.django_5;
|
||||
};
|
||||
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-frontend = withDjango5.callPackage ./pkgs/e11sync-frontend.nix {};
|
||||
e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {};
|
||||
})
|
||||
]
|
||||
};
|
||||
}
|
||||
);
|
||||
in {
|
||||
geoip-mmdb = withDjango5.callPackage ./pkgs/geoip-mmdb.nix {
|
||||
inherit geoip2-tarball;
|
||||
};
|
||||
e11sync-static = withDjango5.callPackage ./pkgs/e11sync-static.nix {};
|
||||
e11sync-frontend = withDjango5.callPackage ./pkgs/e11sync-frontend.nix {};
|
||||
e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {};
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue