From 3b4d67f96c3e814cbded2da40bfa77e261e7c7aa Mon Sep 17 00:00:00 2001 From: atagen Date: Thu, 5 Dec 2024 13:47:10 +1100 Subject: [PATCH] fix overlay/module --- flake.nix | 23 ++++++++++++----------- nix/module.nix | 8 +++----- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index e8ff471..5afcf83 100644 --- 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 diff --git a/nix/module.nix b/nix/module.nix index 991afdb..b79d426 100644 --- 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]; }