summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-23 16:40:29 +0200
committerlassulus <lassulus@lassul.us>2017-07-23 16:40:29 +0200
commitfd0e1e8c6b54db1c0448cb228640aa8847e1918f (patch)
treed6daf949f216540e6128f203a983f4b7c273d8d0
parent6d7b053740b1753d3d099b4170ea4da872a883a3 (diff)
parent3f3b04963a263bd8b0c0fe3eeb8884b5a02d30e3 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/2configs/nginx/krebs-pages.nix13
-rw-r--r--tv/5pkgs/simple/default.nix24
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 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};
+ '';
+ };
+ };
+}
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 <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 ./.))))