e11sync

commit 5c957684e4f2a3ae15e687b4a4324dfdb9ba3eaf (tree)
parent 9bc1db9fe07655f3a7ad565eb208b8ac5b9fa538
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Sat, 20 Jan 2024 12:11:17 +0200

e11sync.overlay: expose a non-list

Diffstat:
M
flake.nix
 | 
7
++++---
M
modules/e11sync/default.nix
 | 
4
++--
M
overlays.nix
 | 
36
+++++++++++++++++-------------------

3 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -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;
     };
 }
diff --git a/modules/e11sync/default.nix b/modules/e11sync/default.nix
@@ -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; {
diff --git a/overlays.nix b/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 {};
+})