diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-07-07 17:48:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 17:48:29 +0200 |
| commit | ea5b2df8659f5f2dace90f56a616c5f7793c7112 (patch) | |
| tree | d99b661fba2e0c7b0f84b0b1f9e0ae4a405e28f7 /nixos/modules | |
| parent | 93b1b3d6e64d37b85d751d5855d227090f6cf3ee (diff) | |
| parent | f6a7b851d4f646ad6770beaa54556dd882c9bde0 (diff) | |
| download | nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.tar nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.tar.gz nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.tar.bz2 nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.tar.lz nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.tar.xz nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.tar.zst nixlib-ea5b2df8659f5f2dace90f56a616c5f7793c7112.zip | |
Merge pull request #27094 from nand0p/buildbot-0.9.9
buildbot: 0.9.7 -> 0.9.9.post2
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/continuous-integration/buildbot/master.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index fe0c452d0672..846efc8b5b9a 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -225,11 +225,7 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.www}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.waterfall-view}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.console-view}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages:${pkgs.python27Packages.dateutil}/lib/python2.7/site-packages:${pkgs.python27Packages.six}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy}/lib/python2.7/site-packages:${pkgs.python27Packages.jinja2}/lib/python2.7/site-packages:${pkgs.python27Packages.markupsafe}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy_migrate}/lib/python2.7/site-packages:${pkgs.python27Packages.tempita}/lib/python2.7/site-packages:${pkgs.python27Packages.decorator}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlparse}/lib/python2.7/site-packages:${pkgs.python27Packages.txaio}/lib/python2.7/site-packages:${pkgs.python27Packages.autobahn}/lib/python2.7/site-packages:${pkgs.python27Packages.pyjwt}/lib/python2.7/site-packages:${pkgs.python27Packages.distro}/lib/python2.7/site-packages:${pkgs.python27Packages.pbr}/lib/python2.7/site-packages:${pkgs.python27Packages.urllib3}/lib/python2.7/site-packages"; - - # NOTE: call twistd directly with stdout logging for systemd - #ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; - ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac"; + ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; }; }; |