diff options
Diffstat (limited to 'jeschli/5pkgs')
-rw-r--r-- | jeschli/5pkgs/default.nix | 11 | ||||
-rw-r--r-- | jeschli/5pkgs/simple/default.nix | 18 |
2 files changed, 0 insertions, 29 deletions
diff --git a/jeschli/5pkgs/default.nix b/jeschli/5pkgs/default.nix deleted file mode 100644 index 3fa5b5e8..00000000 --- a/jeschli/5pkgs/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -with import <stockholm/lib>; - -self: super: - -# Import files and subdirectories like they are overlays. -foldl' mergeAttrs {} - (map - (name: import (./. + "/${name}") self super) - (filter - (name: name != "default.nix" && !hasPrefix "." name) - (attrNames (readDir ./.)))) diff --git a/jeschli/5pkgs/simple/default.nix b/jeschli/5pkgs/simple/default.nix deleted file mode 100644 index 6ba4fec8..00000000 --- a/jeschli/5pkgs/simple/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -with import <stockholm/lib>; - -self: super: - -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 - - mapNixDir (path: callPackage path {}) ./. |