buildbot: remove nixpkgs-fix
buildbot master cannot be run as forking anymore we start it as --nodaemon as normal type
This commit is contained in:
parent
2653cbd257
commit
7db5d59018
|
@ -341,8 +341,6 @@ let
|
||||||
secretsdir = shell.escape (toString <secrets>);
|
secretsdir = shell.escape (toString <secrets>);
|
||||||
in {
|
in {
|
||||||
PermissionsStartOnly = true;
|
PermissionsStartOnly = true;
|
||||||
Type = "forking";
|
|
||||||
PIDFile = "${workdir}/twistd.pid";
|
|
||||||
# TODO: maybe also prepare buildbot.tac?
|
# TODO: maybe also prepare buildbot.tac?
|
||||||
ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
|
ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
|
||||||
set -efux
|
set -efux
|
||||||
|
@ -366,9 +364,7 @@ let
|
||||||
chmod 700 -R ${workdir}
|
chmod 700 -R ${workdir}
|
||||||
chown buildbotMaster:buildbotMaster -R ${workdir}
|
chown buildbotMaster:buildbotMaster -R ${workdir}
|
||||||
'';
|
'';
|
||||||
ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start ${workdir}";
|
ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start --nodaemon ${workdir}";
|
||||||
ExecStop = "${pkgs.buildbot-classic}/bin/buildbot stop ${workdir}";
|
|
||||||
ExecReload = "${pkgs.buildbot-classic}/bin/buildbot reconfig ${workdir}";
|
|
||||||
PrivateTmp = "true";
|
PrivateTmp = "true";
|
||||||
User = "buildbotMaster";
|
User = "buildbotMaster";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
|
|
|
@ -1,21 +1,14 @@
|
||||||
{ fetchgit, fetchFromGitHub, python2Packages, git, ... }:
|
{ pkgs, fetchgit, fetchFromGitHub, python2Packages, git, ... }:
|
||||||
let
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/14026
|
|
||||||
nixpkgs-fix = import (fetchgit {
|
|
||||||
url = https://github.com/nixos/nixpkgs;
|
|
||||||
rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
|
|
||||||
sha256 = "11lqd480bi6xbi7xbh4krrxmbp6a6iafv1d0q3sj461al0x0has8";
|
|
||||||
}) {};
|
|
||||||
|
|
||||||
in nixpkgs-fix.buildPythonApplication {
|
python2Packages.buildPythonApplication {
|
||||||
name = "buildbot-classic-0.8.13";
|
name = "buildbot-classic-0.8.13";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
patches = [];
|
patches = [];
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/krebscode/buildbot-classic";
|
url = "https://github.com/krebscode/buildbot-classic";
|
||||||
rev = "211ec7815";
|
rev = "da5c0204e";
|
||||||
sha256 = "0cyn406r31qdqhpsih7w83x47b443svpgfhxqd6w3iryv0y1z95i";
|
sha256 = "12aaq8ir9k7n2x9m2jnpcs4rr3pcixncbd3bm36ndh93n80q1z3j";
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -33,11 +26,13 @@ in nixpkgs-fix.buildPythonApplication {
|
||||||
sed -i 's/==/>=/' setup.py
|
sed -i 's/==/>=/' setup.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = with nixpkgs-fix.pythonPackages; [
|
propagatedBuildInputs = [
|
||||||
jinja2
|
python2Packages.jinja2
|
||||||
twisted
|
python2Packages.twisted
|
||||||
dateutil_1_5
|
python2Packages.dateutil_1_5
|
||||||
sqlalchemy_migrate_0_7
|
python2Packages.sqlalchemy_migrate
|
||||||
|
python2Packages.pysqlite
|
||||||
|
pkgs.coreutils
|
||||||
];
|
];
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
Loading…
Reference in New Issue
Block a user