From 2dc8f450f3cf2ac0a0246878d81dceeecf7c9012 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Jul 2017 12:50:36 +0200 Subject: [PATCH 1/2] tv nginx krebs-pages: init --- tv/2configs/nginx/krebs-pages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tv/2configs/nginx/krebs-pages.nix diff --git a/tv/2configs/nginx/krebs-pages.nix b/tv/2configs/nginx/krebs-pages.nix new file mode 100644 index 000000000..4dd643db7 --- /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}; + ''; + }; + }; +} From 3f3b04963a263bd8b0c0fe3eeb8884b5a02d30e3 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 23 Jul 2017 13:33:03 +0200 Subject: [PATCH 2/2] tv pkgs simple: add missing default.nix --- tv/5pkgs/simple/default.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 tv/5pkgs/simple/default.nix diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix new file mode 100644 index 000000000..1b9d8c235 --- /dev/null +++ b/tv/5pkgs/simple/default.nix @@ -0,0 +1,24 @@ +with import ; + +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 ./.))))