From b798cf6d60baf5aad5438ba5936259c64d87299c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 12 May 2019 10:49:32 +0200
Subject: Move buildbot plugin buildslist to pkgs

---
 nixops/modules/buildbot/bower.nix       |  9 --------
 nixops/modules/buildbot/buildslist.json | 14 ------------
 nixops/modules/buildbot/default.nix     | 40 +--------------------------------
 3 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 nixops/modules/buildbot/bower.nix
 delete mode 100644 nixops/modules/buildbot/buildslist.json

(limited to 'nixops')

diff --git a/nixops/modules/buildbot/bower.nix b/nixops/modules/buildbot/bower.nix
deleted file mode 100644
index 8b26e0a..0000000
--- a/nixops/modules/buildbot/bower.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
-{ fetchbower, buildEnv }:
-buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "jquery" "2.1.1" "2.1.1" "1qir36vi0bppjr9ckm6303vk1f1dkvq5wandpihb7dxl76s832bd")
-  (fetchbower "angular" "1.5.11" "~1.5.3" "1sw31v3dhmxwgrmncw2f9yl07i9px62ssbj0739zsgi59cq2khl7")
-  (fetchbower "lodash" "2.4.2" "~2.4.1" "0bhqarlvhlrxfvcgnxgsrsjgi6az4c117ffxyfi7gjwr9cvrzz4q")
-  (fetchbower "angular-mocks" "1.5.11" "~1.5.3" "0yv0396fw51i6d9lwiwf241rmc28rnxgg2aa9vsc7dnm4qjkn6gx")
-  (fetchbower "buildbot-data" "2.1.0" "~2.1.0" "0hkmm1byy7d712898lhkxf7i0wshmd1f8cr98iz67679nm6abimk")
-]; }
diff --git a/nixops/modules/buildbot/buildslist.json b/nixops/modules/buildbot/buildslist.json
deleted file mode 100644
index 2418d17..0000000
--- a/nixops/modules/buildbot/buildslist.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "9e87787-master",
-  "meta": {
-    "name": "buildslist",
-    "url": "gitolite@git.immae.eu:perso/Immae/Projets/Buildbot/buildslist",
-    "branch": "master"
-  },
-  "git": {
-    "url": "gitolite@git.immae.eu:perso/Immae/Projets/Buildbot/buildslist",
-    "rev": "9e87787b40f4d6435218268e516be56eacd8d17b",
-    "sha256": "0bli9w0xwpij23jblggz2zwhb7y3gkjdvsppcy6ia3m0x0siclpi",
-    "fetchSubmodules": true
-  }
-}
diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index 5cf833b..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 = {
-- 
cgit v1.2.3