callObsolescentPackage: init from local definition

1 files changed, 2 insertions, 13 deletions

diff --git a/pkgs/simple/default.nix b/pkgs/simple/default.nix
index 1e63017..3dac0aa 100644
--- a/pkgs/simple/default.nix
+++ b/pkgs/simple/default.nix
@@ -1,18 +1,7 @@
 self: super:
 
 let
-  inherit (super) lib mylib;
-
-  # This callPackage will try to detect obsolete overrides.
-  callPackage = 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;
+  inherit (super) mylib;
 in
 
-  mylib.mapNixDir (path: callPackage path {}) ./.
+mylib.mapNixDir (path: self.callObsolescentPackage path {}) ./.