From 8141ee43d821bd45af9f4ce35a710eedaa61f1cf Mon Sep 17 00:00:00 2001
From: Jake Hamilton <jake.hamilton@hey.com>
Date: Fri, 9 Sep 2022 15:43:18 -0700
Subject: [PATCH] fix(overlay): properly merge namespaced packages

---
 lib/flake/default.nix   | 37 ++++++++++++++++++++-----------------
 lib/overlay/default.nix | 14 ++++----------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/lib/flake/default.nix b/lib/flake/default.nix
index 3dde044..6e076eb 100644
--- a/lib/flake/default.nix
+++ b/lib/flake/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  inherit (core-inputs.nixpkgs.lib) assertMsg fold filterAttrs const;
+  inherit (core-inputs.nixpkgs.lib) assertMsg foldl filterAttrs const;
 in
 rec {
   flake = rec {
@@ -132,23 +132,26 @@ rec {
         let
           overlay-package-namespace = full-flake-options.overlay-package-namespace or null;
           user-overlay-packages =
-            snowfall-lib.attrs.merge-deep
-              (builtins.map (overlay: overlay final prev) (builtins.attrValues flake-outputs.overlays));
-        in
-        if overlay-package-namespace == null then
-          user-overlay-packages
-        else if prev ? "${overlay-package-namespace}" then
-          {
-            ${overlay-package-namespace} =
-              snowfall-lib.attrs.merge-deep [
-                prev.${overlay-package-namespace}
+            (builtins.map (overlay: overlay final prev) (builtins.attrValues flake-outputs.overlays));
+          namespaced-user-overlay-packages =
+            foldl
+              (namespaced-user-overlay-packages: user-overlay-package:
+                namespaced-user-overlay-packages // user-overlay-package.${overlay-package-namespace}
+              )
+              { }
+              user-overlay-packages;
+          merged-user-overlay-packages =
+            if overlay-package-namespace == null then
+              snowfall-lib.attrs.merge-shallow
                 user-overlay-packages
-              ];
-          }
-        else
-          {
-            ${overlay-package-namespace} = user-overlay-packages;
-          }
+            else
+              {
+                ${overlay-package-namespace} =
+                  (prev.${overlay-package-namespace} or { })
+                  // namespaced-user-overlay-packages;
+              };
+        in
+        merged-user-overlay-packages
       );
     in
     flake-outputs // {
diff --git a/lib/overlay/default.nix b/lib/overlay/default.nix
index 45d7379..5b3f6b6 100644
--- a/lib/overlay/default.nix
+++ b/lib/overlay/default.nix
@@ -25,7 +25,7 @@ in
         user-packages-overlay = final: prev:
           let
             user-packages = snowfall-lib.package.create-packages {
-              pkgs = prev;
+              pkgs = final;
               channels = channels;
             };
             user-packages-without-default = builtins.removeAttrs
@@ -33,17 +33,11 @@ in
           in
           if overlay-package-namespace == null then
             user-packages-without-default
-          else if prev ? "${overlay-package-namespace}" then
-            {
-              ${overlay-package-namespace} =
-                snowfall-lib.attrs.merge-deep [
-                  prev.${overlay-package-namespace}
-                  user-packages-without-default
-                ];
-            }
           else
             {
-              ${overlay-package-namespace} = user-packages-without-default;
+              ${overlay-package-namespace} =
+                (prev.${overlay-package-namespace} or { })
+                // user-packages-without-default;
             };
         overlays = [ user-packages-overlay ] ++ extra-overlays ++ (builtins.map create-overlay user-overlays);
       in