flake: use scopes to manage packages output

1 files changed, 10 insertions, 4 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index cd49eb2..399a8fd 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,15 +6,21 @@ _: {
     ...
   }: {
     packages = let
+      inherit (builtins) elem;
+      inherit (lib) filterAttrs makeScope;
+      inherit (pkgs) newScope;
+
       p = let
-        packages = import ./all-packages.nix {prev = pkgs;};
+        packages = makeScope newScope (final: import ./all-packages.nix final pkgs);
       in
-        lib.filterAttrs (_: v:
-          builtins.elem system (v.meta.platforms or []) && !(v.meta.broken or false))
+        filterAttrs (_: v:
+          elem system (v.meta.platforms or []) && !(v.meta.broken or false))
         packages;
     in
       p // {default = p.treefetch;};
   };
 
-  flake.overlays.default = final: prev: import ./all-packages.nix {inherit final prev;};
+  flake = {
+    overlays.default = final: prev: (import ./all-packages.nix final prev);
+  };
 }