aboutsummaryrefslogtreecommitdiff
path: root/nixops
diff options
context:
space:
mode:
Diffstat (limited to 'nixops')
-rw-r--r--nixops/modules/buildbot/bower.nix9
-rw-r--r--nixops/modules/buildbot/buildslist.json14
-rw-r--r--nixops/modules/buildbot/default.nix40
3 files changed, 1 insertions, 62 deletions
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 @@
1# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
2{ fetchbower, buildEnv }:
3buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
4 (fetchbower "jquery" "2.1.1" "2.1.1" "1qir36vi0bppjr9ckm6303vk1f1dkvq5wandpihb7dxl76s832bd")
5 (fetchbower "angular" "1.5.11" "~1.5.3" "1sw31v3dhmxwgrmncw2f9yl07i9px62ssbj0739zsgi59cq2khl7")
6 (fetchbower "lodash" "2.4.2" "~2.4.1" "0bhqarlvhlrxfvcgnxgsrsjgi6az4c117ffxyfi7gjwr9cvrzz4q")
7 (fetchbower "angular-mocks" "1.5.11" "~1.5.3" "0yv0396fw51i6d9lwiwf241rmc28rnxgg2aa9vsc7dnm4qjkn6gx")
8 (fetchbower "buildbot-data" "2.1.0" "~2.1.0" "0hkmm1byy7d712898lhkxf7i0wshmd1f8cr98iz67679nm6abimk")
9]; }
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 @@
1{
2 "tag": "9e87787-master",
3 "meta": {
4 "name": "buildslist",
5 "url": "gitolite@git.immae.eu:perso/Immae/Projets/Buildbot/buildslist",
6 "branch": "master"
7 },
8 "git": {
9 "url": "gitolite@git.immae.eu:perso/Immae/Projets/Buildbot/buildslist",
10 "rev": "9e87787b40f4d6435218268e516be56eacd8d17b",
11 "sha256": "0bli9w0xwpij23jblggz2zwhb7y3gkjdvsppcy6ia3m0x0siclpi",
12 "fetchSubmodules": true
13 }
14}
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 @@
1{ lib, pkgs, config, myconfig, mylibs, ... }: 1{ lib, pkgs, config, myconfig, mylibs, ... }:
2let 2let
3 varDir = "/var/lib/buildbot"; 3 varDir = "/var/lib/buildbot";
4 buildslist_src = mylibs.fetchedGitPrivate ./buildslist.json;
5 buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
6 name = "buildslist-yarn-modules";
7 pname = name;
8 inherit (pkgs.buildbot-pkg) version;
9 packageJSON = "${buildslist_src.src}/package.json";
10 yarnLock = "${buildslist_src.src}/yarn.lock";
11 pkgConfig = {
12 all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
13 };
14 };
15 buildslist_bower = pkgs.buildBowerComponents {
16 name = "buildslist";
17 generated = ./bower.nix;
18 src = "${buildslist_src.src}/guanlecoja/";
19 };
20
21 buildslist = pkgs.python3Packages.buildPythonPackage rec {
22 pname = "buildbot-buildslist";
23 inherit (pkgs.buildbot-pkg) version;
24
25 preConfigure = ''
26 export HOME=$PWD
27 cp -a ${buildslist_yarn}/node_modules .
28 chmod -R u+w node_modules
29 cp -a ${buildslist_bower}/bower_components ./libs
30 chmod -R u+w libs
31 '';
32 propagatedBuildInputs = with pkgs.python3Packages; [
33 (klein.overridePythonAttrs(old: { checkPhase = ""; }))
34 buildbot-pkg
35 ];
36 nativeBuildInputs = with pkgs; [ yarn nodejs ];
37 buildInputs = [ buildslist_yarn buildslist_bower ];
38
39 doCheck = false;
40 src = buildslist_src.src;
41 };
42 buildbot_common = pkgs.python3Packages.buildPythonPackage rec { 4 buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
43 name = "buildbot_common"; 5 name = "buildbot_common";
44 src = ./common; 6 src = ./common;
@@ -48,7 +10,7 @@ let
48 cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common 10 cp -a $src $out/${pkgs.python3.pythonForBuild.sitePackages}/buildbot_common
49 ''; 11 '';
50 }; 12 };
51 buildbot = pkgs.python3Packages.buildbot-full.withPlugins ([ buildslist ]); 13 buildbot = pkgs.python3Packages.buildbot-full;
52in 14in
53{ 15{
54 options = { 16 options = {