Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
fd0e1e8c6b
13
tv/2configs/nginx/krebs-pages.nix
Normal file
13
tv/2configs/nginx/krebs-pages.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.nginx = {
|
||||||
|
virtualHosts.krebs-pages = {
|
||||||
|
serverAliases = [
|
||||||
|
"krebs.${config.krebs.build.host.name}.r"
|
||||||
|
];
|
||||||
|
extraConfig = ''
|
||||||
|
root ${pkgs.krebs-pages};
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
24
tv/5pkgs/simple/default.nix
Normal file
24
tv/5pkgs/simple/default.nix
Normal file
|
@ -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 ./.))))
|
Loading…
Reference in New Issue
Block a user