Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
makefu 2015-08-24 13:16:35 +02:00
commit b25efb56e9
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
krebs/4lib/types.nix
View File

@ -47,7 +47,8 @@ types // rec {
}; };
addrs = mkOption { addrs = mkOption {
type = listOf addr; type = listOf addr;
apply = _: config.addrs4 ++ config.addrs6; default = config.addrs4 ++ config.addrs6;
# TODO only default addrs make sense
}; };
addrs4 = mkOption { addrs4 = mkOption {
type = listOf addr4; type = listOf addr4;

4
tv/1systems/cd.nix
View File

@ -14,8 +14,8 @@ in
krebs.build.deps = { krebs.build.deps = {
nixpkgs = { nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/4z3/nixpkgs;
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
}; };
secrets = { secrets = {
url = "/home/tv/secrets/${config.krebs.build.host.name}"; url = "/home/tv/secrets/${config.krebs.build.host.name}";

4
tv/1systems/nomic.nix
View File

@ -10,8 +10,8 @@ with lib;
krebs.build.deps = { krebs.build.deps = {
nixpkgs = { nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/4z3/nixpkgs;
rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
}; };
secrets = { secrets = {
url = "/home/tv/secrets/${config.krebs.build.host.name}"; url = "/home/tv/secrets/${config.krebs.build.host.name}";

4
tv/1systems/wu.nix
View File

@ -14,8 +14,8 @@ in
krebs.build.deps = { krebs.build.deps = {
nixpkgs = { nixpkgs = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/4z3/nixpkgs;
rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
}; };
secrets = { secrets = {
url = "/home/tv/secrets/${config.krebs.build.host.name}"; url = "/home/tv/secrets/${config.krebs.build.host.name}";

12
tv/2configs/git.nix
View File

@ -8,14 +8,14 @@ let
enable = true; enable = true;
root-title = "public repositories at ${config.krebs.build.host.name}"; root-title = "public repositories at ${config.krebs.build.host.name}";
root-desc = "keep calm and engage"; root-desc = "keep calm and engage";
inherit repos rules; repos = mapAttrs (_: s: removeAttrs s ["collaborators"]) repos;
rules = rules;
}; };
}; };
repos = mapAttrs (_: s: removeAttrs s ["collaborators"]) ( repos =
public-repos // public-repos //
optionalAttrs config.krebs.build.host.secure restricted-repos optionalAttrs config.krebs.build.host.secure restricted-repos;
);
rules = concatMap make-rules (attrValues repos); rules = concatMap make-rules (attrValues repos);
@ -66,8 +66,8 @@ let
}; };
}; };
make-restricted-repo = name: { desc ? null, ... }: { make-restricted-repo = name: { collaborators ? [], desc ? null, ... }: {
inherit name desc; inherit name collaborators desc;
public = false; public = false;
}; };

2
tv/2configs/urlwatch.nix
View File

@ -11,6 +11,8 @@
# 2014-07-29 when one of the following urls change # 2014-07-29 when one of the following urls change
# then we have to update the package # then we have to update the package
http://www.exim.org/
# ref src/nixpkgs/pkgs/tools/admin/sec/default.nix # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix
https://api.github.com/repos/simple-evcorr/sec/tags https://api.github.com/repos/simple-evcorr/sec/tags