From 18776d2ca2fc586f2de57b68ad70906d3cb0a5d1 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 20 Aug 2015 08:34:22 +0200 Subject: krebs types net.addrs: s/apply/default/ This is required for new nixos-unstable. --- krebs/4lib/types.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix index f767d20fe..4e123e723 100644 --- a/krebs/4lib/types.nix +++ b/krebs/4lib/types.nix @@ -47,7 +47,8 @@ types // rec { }; addrs = mkOption { type = listOf addr; - apply = _: config.addrs4 ++ config.addrs6; + default = config.addrs4 ++ config.addrs6; + # TODO only default addrs make sense }; addrs4 = mkOption { type = listOf addr4; -- cgit v1.2.3 From c51104734a647365cc3a028810a73faeef8928b2 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 20 Aug 2015 08:21:27 +0200 Subject: nomic nixpkgs: 9d5508d -> 1357692 --- tv/1systems/nomic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 6418cdc5e..9d33f2a7a 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -11,7 +11,7 @@ with lib; krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; secrets = { url = "/home/tv/secrets/${config.krebs.build.host.name}"; -- cgit v1.2.3 From 288d180542a0e7f811b5e08e178f50878f9d687b Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 20 Aug 2015 10:17:24 +0200 Subject: {cd,nomic,wu} nixpkgs: -> 03130ec [4z3] --- tv/1systems/cd.nix | 4 ++-- tv/1systems/nomic.nix | 4 ++-- tv/1systems/wu.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 659b95065..9f412d9b8 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -14,8 +14,8 @@ in krebs.build.deps = { nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + url = https://github.com/4z3/nixpkgs; + rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692 }; secrets = { url = "/home/tv/secrets/${config.krebs.build.host.name}"; diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 9d33f2a7a..028e53539 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -10,8 +10,8 @@ with lib; krebs.build.deps = { nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; + url = https://github.com/4z3/nixpkgs; + rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692 }; secrets = { url = "/home/tv/secrets/${config.krebs.build.host.name}"; diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 20dbca12f..2233b48d1 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -14,8 +14,8 @@ in krebs.build.deps = { nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; + url = https://github.com/4z3/nixpkgs; + rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692 }; secrets = { url = "/home/tv/secrets/${config.krebs.build.host.name}"; -- cgit v1.2.3 From 443d7878b6b57413e81ad89039afbebdeb6a3807 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 20 Aug 2015 10:18:09 +0200 Subject: tv urlwatch: +exim --- tv/2configs/urlwatch.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index a69b1519c..26e56e09c 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -11,6 +11,8 @@ # 2014-07-29 when one of the following urls change # then we have to update the package + http://www.exim.org/ + # ref src/nixpkgs/pkgs/tools/admin/sec/default.nix https://api.github.com/repos/simple-evcorr/sec/tags -- cgit v1.2.3 From c73b2f6c175625f08d5898320ea8fcb336f393aa Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 24 Aug 2015 11:22:05 +0200 Subject: tv git: allow secret collaborateurs --- tv/2configs/git.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 8d662494c..264cb4a1c 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -8,14 +8,14 @@ let enable = true; root-title = "public repositories at ${config.krebs.build.host.name}"; 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 // - optionalAttrs config.krebs.build.host.secure restricted-repos - ); + optionalAttrs config.krebs.build.host.secure restricted-repos; rules = concatMap make-rules (attrValues repos); @@ -66,8 +66,8 @@ let }; }; - make-restricted-repo = name: { desc ? null, ... }: { - inherit name desc; + make-restricted-repo = name: { collaborators ? [], desc ? null, ... }: { + inherit name collaborators desc; public = false; }; -- cgit v1.2.3