fix overlay/module

2024-12-05 13:47:10 +11:00 · 2024-12-05 13:47:10 +11:00 · 3b4d67f96c
commit 3b4d67f96c
parent bea46cef34
2 changed files with 15 additions and 16 deletions
--- a/flake.nix
+++ b/flake.nix
@ -104,18 +104,19 @@
      }
    )
    // {
-      nixosModules.culr = import ./nix/module.nix {overlay = self.overlays.culr;};
+      nixosModules.culr = import ./nix/module.nix {culrOverlay = self.overlays.culr;};

-      overlays.culr = final: prev: let
-        inherit
-          (prev.ocaml-ng)
-          dune_3
-          ocaml
-          angstrom
-          angstrom-unix
-          ppx_inline_test
-          ;
-        ocaml-deps = [
+      overlays.culr = final: _prev: let
+        ocaml-deps = let
+          inherit
+            (final.ocaml-ng)
+            dune_3
+            ocaml
+            angstrom
+            angstrom-unix
+            ppx_inline_test
+            ;
+        in [
          dune_3
          ocaml
          angstrom
--- a/nix/module.nix
+++ b/nix/module.nix
@ -1,6 +1,4 @@
-{
-	overlay
-}: {
-	imports = [./culr-module.nix];
-	nixpkgs.overlays = overlay;
+{culrOverlay}: {
+  imports = [./culr-module.nix];
+  nixpkgs.overlays = [culrOverlay];
 }