-
-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23642 from copumpkin/buildbot-cleanup
buildbot: assorted cleanups
- Loading branch information
Showing
3 changed files
with
79 additions
and
76 deletions.
There are no files selected for viewing
139 changes: 73 additions & 66 deletions
139
pkgs/development/tools/build-managers/buildbot/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,76 +1,83 @@ | ||
{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper, | ||
pythonPackages, gnused, plugins ? [] }: | ||
{ stdenv, lib, openssh, buildbot-worker, pythonPackages, runCommand, makeWrapper }: | ||
|
||
pythonPackages.buildPythonApplication (rec { | ||
name = "${pname}-${version}"; | ||
pname = "buildbot"; | ||
version = "0.9.4"; | ||
src = fetchurl { | ||
url = "mirror://pypi/b/${pname}/${name}.tar.gz"; | ||
sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086"; | ||
}; | ||
let | ||
withPlugins = plugins: runCommand "wrapped-${package.name}" { | ||
buildInputs = [ makeWrapper ]; | ||
passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); | ||
} '' | ||
makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ | ||
--prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins} | ||
''; | ||
|
||
buildInputs = with pythonPackages; [ | ||
lz4 | ||
txrequests | ||
pyjade | ||
boto3 | ||
moto | ||
txgithub | ||
mock | ||
setuptoolsTrial | ||
isort | ||
pylint | ||
astroid | ||
pyflakes | ||
openssh | ||
buildbot-worker | ||
makeWrapper | ||
treq | ||
]; | ||
package = pythonPackages.buildPythonApplication (rec { | ||
name = "${pname}-${version}"; | ||
pname = "buildbot"; | ||
version = "0.9.4"; | ||
|
||
propagatedBuildInputs = with pythonPackages; [ | ||
src = pythonPackages.fetchPypi { | ||
inherit pname version; | ||
sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086"; | ||
}; | ||
|
||
# core | ||
twisted | ||
jinja2 | ||
zope_interface | ||
sqlalchemy | ||
sqlalchemy_migrate | ||
future | ||
dateutil | ||
txaio | ||
autobahn | ||
pyjwt | ||
buildInputs = with pythonPackages; [ | ||
lz4 | ||
txrequests | ||
pyjade | ||
boto3 | ||
moto | ||
txgithub | ||
mock | ||
setuptoolsTrial | ||
isort | ||
pylint | ||
astroid | ||
pyflakes | ||
openssh | ||
buildbot-worker | ||
treq | ||
]; | ||
|
||
# tls | ||
pyopenssl | ||
service-identity | ||
idna | ||
propagatedBuildInputs = with pythonPackages; [ | ||
|
||
# docs | ||
sphinx | ||
sphinxcontrib-blockdiag | ||
sphinxcontrib-spelling | ||
pyenchant | ||
docutils | ||
ramlfications | ||
sphinx-jinja | ||
# core | ||
twisted | ||
jinja2 | ||
zope_interface | ||
sqlalchemy | ||
sqlalchemy_migrate | ||
future | ||
dateutil | ||
txaio | ||
autobahn | ||
pyjwt | ||
|
||
] ++ plugins; | ||
# tls | ||
pyopenssl | ||
service-identity | ||
idna | ||
|
||
postPatch = '' | ||
${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py | ||
''; | ||
# docs | ||
sphinx | ||
sphinxcontrib-blockdiag | ||
sphinxcontrib-spelling | ||
pyenchant | ||
docutils | ||
ramlfications | ||
sphinx-jinja | ||
|
||
postFixup = '' | ||
makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH" | ||
''; | ||
]; | ||
|
||
postPatch = '' | ||
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" | ||
''; | ||
|
||
passthru = { inherit withPlugins; }; | ||
|
||
meta = with stdenv.lib; { | ||
homepage = http://buildbot.net/; | ||
description = "Continuous integration system that automates the build/test cycle"; | ||
maintainers = with maintainers; [ nand0p ryansydnor ]; | ||
license = licenses.gpl2; | ||
}; | ||
}) | ||
meta = with stdenv.lib; { | ||
homepage = http://buildbot.net/; | ||
description = "Continuous integration system that automates the build/test cycle"; | ||
maintainers = with maintainers; [ nand0p ryansydnor ]; | ||
license = licenses.gpl2; | ||
}; | ||
}); | ||
in package |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters