4 files changed, 40 insertions, 6 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b80479eaa..475c17f2f 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "31c72ce266b0179efa877bb3acd7dfd7b746537b";
+        ref = "cd41bfeeb1aaa10e4d412f2bd90dc2844a7c5df8";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index ace3ed00f..4eb8a10b4 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,7 +1,24 @@
 { config, pkgs, ... }:
 with import <stockholm/lib>;
 {
-  nixpkgs.config.packageOverrides = super: {
+  nixpkgs.config.packageOverrides = 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;
+
+  in {}
+  // mapAttrs (_: flip callPackage {})
+              (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
+                           (subdirsOf ./.))
+  // {
     # TODO use XDG_RUNTIME_DIR?
     cr = pkgs.writeDashBin "cr" ''
       set -efu
@@ -12,7 +29,7 @@ with import <stockholm/lib>;
           --disk-cache-size=50000000 \
           "$@"
     '';
-    ejabberd = pkgs.callPackage ./ejabberd {
+    ejabberd = callPackage ./ejabberd {
       erlang = pkgs.erlangR16;
     };
     ff = pkgs.writeDashBin "ff" ''
@@ -22,8 +39,5 @@ with import <stockholm/lib>;
       if elem config.krebs.build.host.name ["xu" "wu"]
         then super.gnupg21
         else super.gnupg;
-    q = pkgs.callPackage ./q {};
-    viljetic-pages = pkgs.callPackage ./viljetic-pages {};
-    xmonad-tv = import ./xmonad-tv.nix { inherit pkgs; };
   };
 }
diff --git a/tv/5pkgs/djbdns/default.nix b/tv/5pkgs/djbdns/default.nix
new file mode 100644
index 000000000..ad5a530bd
--- /dev/null
+++ b/tv/5pkgs/djbdns/default.nix
@@ -0,0 +1,20 @@
+{ coreutils, gawk, fetchurl, stdenv, ... }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "djbdns-1.05";
+  src = fetchurl {
+    url = "http://cr.yp.to/djbdns/djbdns-1.05.tar.gz";
+    sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w";
+  };
+  configurePhase = ''
+    echo $out > conf-home
+    echo gcc -O2 -include errno.h > conf-cc
+  '';
+  patchPhase = ''
+    sed -i 's:c("/","etc","dnsroots.global",-1,-1,0644);:// &:' hier.c
+    sed -i '1s@^@PATH=${makeBinPath [ coreutils gawk ]}\n@' dnstracesort.sh
+  '';
+  installTargets = "setup check";
+}
diff --git a/tv/5pkgs/xmonad-tv.nix b/tv/5pkgs/xmonad-tv/default.nix
index c6a622bd1..c6a622bd1 100644
--- a/tv/5pkgs/xmonad-tv.nix
+++ b/tv/5pkgs/xmonad-tv/default.nix