Move secrets module outside of nixops

[perso/Immae/Config/Nix.git] / nixops / modules / buildbot / default.nix

diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index 1c37e05df656f76288cf7d9f000cdf65b0fb049a..5cf833b8e2a41bf8ae948accd89c55d4e54362c7 100644 (file)
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -62,33 +62,6 @@ in
   };
 
   config = lib.mkIf config.services.buildbot.enable {
-    nixpkgs.overlays = [ (self: super: rec {
-      python3 = super.python3.override {
-        packageOverrides = python-self: python-super: {
-          wokkel = python-self.buildPythonPackage rec {
-            pname = "wokkel";
-            version = "18.0.0";
-            src = python-self.fetchPypi {
-              inherit pname version;
-              sha256 = "1spq44gg8gsviqx1dvlmjpgfc0wk0jpyx4ap01y2pad1ai9cw016";
-            };
-            propagatedBuildInputs = with python-self; [ twisted.extras.tls twisted incremental dateutil ];
-            doChecks = false;
-          };
-          apprise = python-self.buildPythonPackage rec {
-            pname = "apprise";
-            version = "0.7.4";
-            src = (mylibs.fetchedGithub ./apprise.json).src;
-            propagatedBuildInputs = with python-self; [ decorator
-            requests requests_oauthlib oauthlib urllib3 six click
-            markdown pyyaml sleekxmpp
-            ];
-            doChecks = false;
-          };
-        };
-      };
-    }) ];
-
     ids.uids.buildbot = myconfig.env.buildbot.user.uid;
     ids.gids.buildbot = myconfig.env.buildbot.user.gid;
 
@@ -133,7 +106,7 @@ in
       '';
     }) myconfig.env.buildbot.projects;
 
-    mySecrets.keys = (
+    secrets.keys = (
       lib.lists.flatten (
         lib.attrsets.mapAttrsToList (k: project:
           lib.attrsets.mapAttrsToList (k: v: