refactor(pops/packages): add composeOverlay

tao3k · Nov 22, 2023 · 179d785 · 179d785
1 parent 4c7c604
commit 179d785
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/docs/org/pops-packages.org b/docs/org/pops-packages.org
@@ -99,6 +99,11 @@ in
 
             overlays = {
               default =
+                final: prev:
+                (self.exports.packages.packages (
+                  final // { overrideScope = self.exports.packages.overrideScope; }
+                ));
+              composeOverlay =
                 final: prev:
                 ((self.exports.packages.overrideScope (
                   _: scopeSuper: {
@@ -177,5 +182,17 @@ nix-repl> :p Flake.examples.packages.exports.overlay
 let
   nixos-23_05 = omnibus.flake.inputs.nixos-23_05;
 in
-nixos-23_05.legacyPackages.x86_64-linux.extend super.packages.exports.overlays.default
+nixos-23_05.legacyPackages.x86_64-linux.appendOverlays [
+  # super.packages.exports.overlays.composeOverlay
+  super.packages.exports.overlays.default
+  (final: prev: {
+    python3Packages = prev.python3Packages.override (
+      old: {
+        overrides = prev.lib.composeExtensions (old.packageOverrides or (_: _: { })) (
+          selfP: _: super.packages.exports.packages.py.packages selfP
+        );
+      }
+    );
+  })
+]
     #+end_src
diff --git a/examples/packagesOverlay.nix b/examples/packagesOverlay.nix
@@ -7,5 +7,17 @@
 let
   nixos-23_05 = omnibus.flake.inputs.nixos-23_05;
 in
-nixos-23_05.legacyPackages.x86_64-linux.extend super.packages.exports.overlays.default
+nixos-23_05.legacyPackages.x86_64-linux.appendOverlays [
+  # super.packages.exports.overlays.composeOverlay
+  super.packages.exports.overlays.default
+  (final: prev: {
+    python3Packages = prev.python3Packages.override (
+      old: {
+        overrides = prev.lib.composeExtensions (old.packageOverrides or (_: _: { })) (
+          selfP: _: super.packages.exports.packages.py.packages selfP
+        );
+      }
+    );
+  })
+]
 # Example:3 ends here
diff --git a/src/pops/packages.nix b/src/pops/packages.nix
@@ -86,6 +86,11 @@ in
 
             overlays = {
               default =
+                final: prev:
+                (self.exports.packages.packages (
+                  final // { overrideScope = self.exports.packages.overrideScope; }
+                ));
+              composeOverlay =
                 final: prev:
                 ((self.exports.packages.overrideScope (
                   _: scopeSuper: {