tv: turn pkgs into an overlay

tv/5pkgs/default.nix

@@ -1,40 +1,54 @@
-{ config, pkgs, ... }:
 with import <stockholm/lib>;
-{
+self: super: let
-  nixpkgs.config.packageOverrides = super: let
 
-    # This callPackage will try to detect obsolete overrides.
+  # This callPackage will try to detect obsolete overrides.
-    callPackage = path: args: let
+  callPackage = path: args: let
-      override = super.callPackage path args;
+    override = super.callPackage path args;
-      upstream = optionalAttrs (override ? "name")
+    upstream = optionalAttrs (override ? "name")
-        (super.${(parseDrvName override.name).name} or {});
+      (super.${(parseDrvName override.name).name} or {});
-    in if upstream ? "name" &&
+  in if upstream ? "name" &&
-          override ? "name" &&
+        override ? "name" &&
-          compareVersions upstream.name override.name != -1
+        compareVersions upstream.name override.name != -1
-      then trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override
+    then
-      else override;
+      trace
+        "Upstream `${upstream.name}' gets overridden by `${override.name}'."
+        override
+    else override;
 
-  in {}
+in {
-  // mapAttrs (_: flip callPackage {})
+
-              (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
+  # TODO use XDG_RUNTIME_DIR?
-                           (subdirsOf ./.))
+  cr = self.writeDashBin "cr" ''
-  // {
+    set -efu
-    # TODO use XDG_RUNTIME_DIR?
+    export LC_TIME=de_DE.utf8
-    cr = pkgs.writeDashBin "cr" ''
+    exec ${self.chromium}/bin/chromium \
-      set -efu
+        --ssl-version-min=tls1 \
-      export LC_TIME=de_DE.utf8
+        --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
-      exec ${pkgs.chromium}/bin/chromium \
+        --disk-cache-size=50000000 \
-          --ssl-version-min=tls1 \
+        "$@"
-          --disk-cache-dir=/tmp/chromium-disk-cache_"$LOGNAME" \
+  '';
-          --disk-cache-size=50000000 \
+
-          "$@"
+  ejabberd = callPackage ./ejabberd {
-    '';
+    erlang = self.erlangR16;
-    ejabberd = callPackage ./ejabberd {
-      erlang = pkgs.erlangR16;
-    };
-    ff = pkgs.writeDashBin "ff" ''
-      exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
-    '';
-    gnupg = pkgs.gnupg21;
   };
+
+  ff = self.writeDashBin "ff" ''
+    exec ${self.firefoxWrapper}/bin/firefox "$@"
+  '';
+
+  gnupg = self.gnupg21;
+
+  # https://github.com/NixOS/nixpkgs/issues/16113
+  wvdial = let
+    nixpkgs-1509 = import (self.fetchFromGitHub {
+      owner = "NixOS"; repo = "nixpkgs-channels";
+      rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
+      sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
+    }) {};
+  in nixpkgs-1509.wvdial;
+
 }
+
+// mapAttrs (_: flip callPackage {})
+            (filterAttrs (_: dir: pathExists (dir + "/default.nix"))
+                         (subdirsOf ./.))

tv/default.nix

@@ -1,9 +1,9 @@
-_:
+{ pkgs, ... }:
 {
   imports = [
     ../krebs
     ./2configs
     ./3modules
-    ./5pkgs
   ];
+  nixpkgs.config.packageOverrides = import ./5pkgs pkgs;
 }