From 5762d122657217f964f4898d9f178ec2f843176a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 23 Jul 2017 02:46:44 +0200
Subject: [PATCH] tv pkgs: mimic krebs' simple overlay

---
 tv/5pkgs/default.nix                          | 31 +++++++------------
 tv/5pkgs/{ => simple}/djbdns/default.nix      |  0
 tv/5pkgs/{ => simple}/q/default.nix           |  0
 .../{ => simple}/viljetic-pages/default.nix   |  0
 .../{ => simple}/viljetic-pages/index.html    |  0
 tv/5pkgs/{ => simple}/viljetic-pages/logo.xpm |  0
 tv/5pkgs/{ => simple}/xmonad-tv/default.nix   |  0
 7 files changed, 11 insertions(+), 20 deletions(-)
 rename tv/5pkgs/{ => simple}/djbdns/default.nix (100%)
 rename tv/5pkgs/{ => simple}/q/default.nix (100%)
 rename tv/5pkgs/{ => simple}/viljetic-pages/default.nix (100%)
 rename tv/5pkgs/{ => simple}/viljetic-pages/index.html (100%)
 rename tv/5pkgs/{ => simple}/viljetic-pages/logo.xpm (100%)
 rename tv/5pkgs/{ => simple}/xmonad-tv/default.nix (100%)

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 02410e8e6..8a7a613ba 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,22 +1,18 @@
 with import <stockholm/lib>;
-self: super: let
 
-  # This callPackage will try to detect obsolete overrides.
-  callPackage = path: args: let
-    override = super.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;
+self: super:
 
-in {
+# 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 ./.))))
 
+//
+
+{
   # TODO use XDG_RUNTIME_DIR?
   cr = self.writeDashBin "cr" ''
     set -efu
@@ -42,9 +38,4 @@ in {
       sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
     }) {};
   in nixpkgs-1509.wvdial;
-
 }
-
-// mapAttrs (_: flip callPackage {})
-            (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
-                         (subdirsOf ./.))
diff --git a/tv/5pkgs/djbdns/default.nix b/tv/5pkgs/simple/djbdns/default.nix
similarity index 100%
rename from tv/5pkgs/djbdns/default.nix
rename to tv/5pkgs/simple/djbdns/default.nix
diff --git a/tv/5pkgs/q/default.nix b/tv/5pkgs/simple/q/default.nix
similarity index 100%
rename from tv/5pkgs/q/default.nix
rename to tv/5pkgs/simple/q/default.nix
diff --git a/tv/5pkgs/viljetic-pages/default.nix b/tv/5pkgs/simple/viljetic-pages/default.nix
similarity index 100%
rename from tv/5pkgs/viljetic-pages/default.nix
rename to tv/5pkgs/simple/viljetic-pages/default.nix
diff --git a/tv/5pkgs/viljetic-pages/index.html b/tv/5pkgs/simple/viljetic-pages/index.html
similarity index 100%
rename from tv/5pkgs/viljetic-pages/index.html
rename to tv/5pkgs/simple/viljetic-pages/index.html
diff --git a/tv/5pkgs/viljetic-pages/logo.xpm b/tv/5pkgs/simple/viljetic-pages/logo.xpm
similarity index 100%
rename from tv/5pkgs/viljetic-pages/logo.xpm
rename to tv/5pkgs/simple/viljetic-pages/logo.xpm
diff --git a/tv/5pkgs/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix
similarity index 100%
rename from tv/5pkgs/xmonad-tv/default.nix
rename to tv/5pkgs/simple/xmonad-tv/default.nix