Merge remote-tracking branch 'ni/master'

2 files changed, 37 insertions, 0 deletions

diff --git a/tv/2configs/nginx/krebs-pages.nix b/tv/2configs/nginx/krebs-pages.nix
new file mode 100644
index 00000000..4dd643db
--- /dev/null
+++ b/tv/2configs/nginx/krebs-pages.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+{
+  services.nginx = {
+    virtualHosts.krebs-pages = {
+      serverAliases = [
+        "krebs.${config.krebs.build.host.name}.r"
+      ];
+      extraConfig = ''
+        root ${pkgs.krebs-pages};
+      '';
+    };
+  };
+}
diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix
new file mode 100644
index 00000000..1b9d8c23
--- /dev/null
+++ b/tv/5pkgs/simple/default.nix
@@ -0,0 +1,24 @@
+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
+
+  listToAttrs
+    (map
+      (name: nameValuePair (removeSuffix ".nix" name)
+                           (callPackage (./. + "/${name}") {}))
+      (filter
+        (name: name != "default.nix" && !hasPrefix "." name)
+        (attrNames (readDir ./.))))