motiejus
/
e11sync
1
Fork 0
Code

e11sync.overlay: expose a non-list

This commit is contained in:
Motiejus Jakštys 2024-01-20 12:11:17 +02:00
parent 9bc1db9fe0
commit 5c957684e4
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -35,11 +35,12 @@
geoip2-tarball, geoip2-tarball,
... ...
}: let }: let
overlays = import ./overlays.nix geoip2-tarball; overlay = import ./overlays.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 overlays; inherit system;
overlays = [overlay];
}; };
in { in {
packages = { packages = {
@ -127,6 +128,6 @@
}; };
nixosModules.e11sync = import ./modules/e11sync geoip2-tarball; nixosModules.e11sync = import ./modules/e11sync geoip2-tarball;
overlays.default = overlays; overlays.default = overlay;
}; };
} }

4
modules/e11sync/default.nix
View File

@ -4,8 +4,8 @@ geoip2-tarball: {
pkgs, pkgs,
... ...
}: let }: let
overlays = import ../../overlays.nix geoip2-tarball; overlay = import ../../overlays.nix geoip2-tarball;
pkgs1 = pkgs.extend (lib.composeManyExtensions overlays); pkgs1 = pkgs.extend overlay;
inherit (pkgs1) e11sync-backend e11sync-frontend; inherit (pkgs1) e11sync-backend e11sync-frontend;
in { in {
options.e11sync = with lib.types; { options.e11sync = with lib.types; {

36
overlays.nix
View File

@ -1,20 +1,18 @@
geoip2-tarball: [ geoip2-tarball: (_: super: let
(_: super: let withDjango5 = super.extend (
withDjango5 = super.extend ( _: super: {
_: super: { python3 = super.python3.override {
python3 = super.python3.override { packageOverrides = _: python-super: {
packageOverrides = _: python-super: { django = python-super.django_5;
django = python-super.django_5;
};
}; };
} };
); }
in { );
geoip-mmdb = withDjango5.callPackage ./pkgs/geoip-mmdb.nix { in {
inherit geoip2-tarball; 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-static = withDjango5.callPackage ./pkgs/e11sync-static.nix {};
e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {}; e11sync-frontend = withDjango5.callPackage ./pkgs/e11sync-frontend.nix {};
}) e11sync-backend = withDjango5.callPackage ./pkgs/e11sync-backend.nix {};
] })