From e6b7fe74c1ec4ff42967e7bd79d7fe669451d047 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 24 May 2017 02:03:46 +0200 Subject: krebs/5pkgs: detect simple obsolete overrides --- krebs/5pkgs/simple/default.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'krebs/5pkgs/simple/default.nix') diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix index 2f6799759..1b9d8c235 100644 --- a/krebs/5pkgs/simple/default.nix +++ b/krebs/5pkgs/simple/default.nix @@ -1,10 +1,24 @@ with import ; self: super: -listToAttrs - (map - (name: nameValuePair (removeSuffix ".nix" name) - (super.callPackage (./. + "/${name}") {})) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (attrNames (readDir ./.)))) + +let + # This callPackage will try to detect obsolete overrides. + callPackage = path: args: let + override = self.callPackage path args; + upstream = optionalAttrs (override ? "name") + (super.${(parseDrvName override.name).name} or {}); + in if upstream ? "name" && + override ? "name" && + compareVersions upstream.name override.name != -1 + then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override + else override; +in + + listToAttrs + (map + (name: nameValuePair (removeSuffix ".nix" name) + (callPackage (./. + "/${name}") {})) + (filter + (name: name != "default.nix" && !hasPrefix "." name) + (attrNames (readDir ./.)))) -- cgit v1.2.3