diff options
| author | makefu <github@syntax-fehler.de> | 2016-08-21 12:12:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-08-21 12:12:13 +0200 |
| commit | 054475b6230ec357523b9eed143667a11db92966 (patch) | |
| tree | dd60906a6b0f6a5d2252536a50044d42e6098915 /krebs/3modules | |
| parent | 54ccd367175e33c0aab67e8ef46d4d73bcf8183c (diff) | |
| parent | 1d9f7b4f2d1a444bb7b19f18efa3bee63c8d3770 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 11 | ||||
| -rw-r--r-- | krebs/3modules/default.nix | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index bd17c3765..5dde50ea4 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -3,15 +3,8 @@ with config.krebs.lib; let - # https://github.com/NixOS/nixpkgs/issues/14026 - nixpkgs-fix = import (pkgs.fetchgit { - url = https://github.com/nixos/nixpkgs; - rev = "e026b5c243ea39810826e68362718f5d703fb5d0"; - sha256 = "87e0724910a6df0371f883f99a8cf42e366fb4119f676f6f74ffb404beca2632"; - }) {}; - - buildbot = nixpkgs-fix.buildbot; - buildbot-master-config = pkgs.writeText "buildbot-master.cfg" '' + buildbot = pkgs.buildbot; + buildbot-master-config = pkgs.writePython2 "buildbot-master.cfg" '' # -*- python -*- from buildbot.plugins import * import re diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9af42acc9..17eae1778 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -153,6 +153,7 @@ let to = concatMapStringsSep "," (getAttr "mail") (toList to); }; in mapAttrsToList format (with config.krebs.users; let + eloop-ml = spam-ml ++ [ ciko Mic92 ]; spam-ml = [ lass makefu @@ -161,8 +162,10 @@ let ciko.mail = "wieczorek.stefan@gmail.com"; Mic92.mail = "joerg@higgsboson.tk"; in { - "*@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; - "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; + "cfp@eloop.org" = eloop-ml; + "kontakt@eloop.org" = eloop-ml; + "root@eloop.org" = eloop-ml; + "eloop2016@krebsco.de" = eloop-ml; "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; "makefu@krebsco.de" = makefu; |