X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fbuildbot%2Fdefault.nix;h=d7dd47943aac86676b582d8f08135ba3714d8417;hb=b798cf6d60baf5aad5438ba5936259c64d87299c;hp=1c37e05df656f76288cf7d9f000cdf65b0fb049a;hpb=167b81657d696e91545cedde172e7859643bba06;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index 1c37e05..d7dd479 100644
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -1,44 +1,6 @@
 { lib, pkgs, config, myconfig, mylibs, ... }:
 let
   varDir = "/var/lib/buildbot";
-  buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json;
-  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
-    name = "buildslist-yarn-modules";
-    pname = name;
-    inherit (pkgs.buildbot-pkg) version;
-    packageJSON = "${buildslist_src.src}/package.json";
-    yarnLock = "${buildslist_src.src}/yarn.lock";
-    pkgConfig = {
-      all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
-    };
-  };
-  buildslist_bower = pkgs.buildBowerComponents {
-    name = "buildslist";
-    generated = ./bower.nix;
-    src = "${buildslist_src.src}/guanlecoja/";
-  };
-
-  buildslist = pkgs.python3Packages.buildPythonPackage rec {
-    pname = "buildbot-buildslist";
-    inherit (pkgs.buildbot-pkg) version;
-
-    preConfigure = ''
-      export HOME=$PWD
-      cp -a ${buildslist_yarn}/node_modules .
-      chmod -R u+w node_modules
-      cp -a ${buildslist_bower}/bower_components ./libs
-      chmod -R u+w libs
-      '';
-    propagatedBuildInputs = with pkgs.python3Packages; [
-      (klein.overridePythonAttrs(old: { checkPhase = ""; }))
-      buildbot-pkg
-    ];
-    nativeBuildInputs = with pkgs; [ yarn nodejs ];
-    buildInputs = [ buildslist_yarn buildslist_bower ];
-
-    doCheck = false;
-    src = buildslist_src.src;
-  };
   buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
     name = "buildbot_common";
     src = ./common;
@@ -48,7 +10,7 @@ let
       cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common
       '';
   };
-  buildbot = pkgs.python3Packages.buildbot-full.withPlugins ([ buildslist ]);
+  buildbot = pkgs.python3Packages.buildbot-full;
 in
 {
   options = {
@@ -62,33 +24,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 +68,7 @@ in
       '';
     }) myconfig.env.buildbot.projects;
 
-    mySecrets.keys = (
+    secrets.keys = (
       lib.lists.flatten (
         lib.attrsets.mapAttrsToList (k: project:
           lib.attrsets.mapAttrsToList (k: v: