callObsolescentPackage: init from local definition

1 files changed, 22 insertions, 5 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index fb90696..fffd289 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -13,8 +13,25 @@ in
 # Import files and subdirectories like they are overlays.
 lib.fix
   (builtins.foldl' (lib.flip lib.extends) (_: super)
-    (map
-      (name: import (./. + "/${name}"))
-      (pushBack "override"
-        (builtins.attrNames
-          (lib.filterAttrs mylib.isNixDirEntry (builtins.readDir ./.))))))
+    (
+      [
+        (self: super: {
+          callObsolescentPackage = path: args: let
+            override = self.callPackage path args;
+            upstream = lib.optionalAttrs (override ? "name")
+              (super.${(builtins.parseDrvName override.name).name} or {});
+          in if upstream ? "name" &&
+                override ? "name" &&
+                builtins.compareVersions upstream.name override.name != -1
+            then builtins.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
+            else override;
+        })
+      ]
+      ++
+      map
+        (name: import (./. + "/${name}"))
+        (pushBack "override"
+          (builtins.attrNames
+            (lib.filterAttrs mylib.isNixDirEntry (builtins.readDir ./.))))
+    )
+  )