diff options
author | Fernando J Pando <fernando.pando@stelligent.com> | 2017-01-30 12:44:14 -0500 |
---|---|---|
committer | Fernando J Pando <fernando.pando@stelligent.com> | 2017-02-07 11:14:42 -0500 |
commit | 34b5c9a4de92120d2c302e084f0139bc3cd8f155 (patch) | |
tree | 0c01e12d896f628fa46e9473847cab604524b08d /pkgs/development/tools | |
parent | 4853900dd3cf1908e92a6287a500368ed4752ef1 (diff) | |
download | nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.tar nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.tar.gz nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.tar.bz2 nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.tar.lz nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.tar.xz nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.tar.zst nixlib-34b5c9a4de92120d2c302e084f0139bc3cd8f155.zip |
buildbot: 0.9.0.post1 -> 0.9.3
- Fixes unneeded patching - Adds worker to build inputs now needed for tests - Replaces enableworker option with worker configuration module - Openssh required for tests - Fixes worker hardcoded paths - Tested on Nixos Unstable
Diffstat (limited to 'pkgs/development/tools')
3 files changed, 33 insertions, 44 deletions
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 8e85c645e2e0..427ff7058405 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,21 +1,13 @@ -{ stdenv, - lib, - pythonPackages, - fetchurl, - coreutils, - openssh, - buildbot-worker, - plugins ? [], - enableLocalWorker ? false -}: +{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper, + pythonPackages, gnused, plugins ? [] }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g"; + sha256 = "1yw7knk5dcvwms14vqwlp89flhjf8567l17s9cq7vydh760nmg62"; }; buildInputs = with pythonPackages; [ @@ -31,7 +23,11 @@ pythonPackages.buildPythonApplication (rec { pylint astroid pyflakes - ] ++ lib.optionals (enableLocalWorker) [openssh]; + openssh + buildbot-worker + makeWrapper + treq + ]; propagatedBuildInputs = with pythonPackages; [ @@ -39,7 +35,6 @@ pythonPackages.buildPythonApplication (rec { twisted jinja2 zope_interface - future sqlalchemy sqlalchemy_migrate future @@ -61,32 +56,21 @@ pythonPackages.buildPythonApplication (rec { ramlfications sphinx-jinja - ] ++ plugins ++ - lib.optionals (enableLocalWorker) [buildbot-worker]; - - preInstall = '' - # writes out a file that can't be read properly - sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py - ''; + ] ++ plugins; postPatch = '' - # re-hardcode path to tail - sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py + ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py ''; postFixup = '' - mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot - echo "#!/bin/sh" > $out/bin/buildbot - echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot - echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot - chmod -c 555 $out/bin/buildbot + makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH" ''; meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Continuous integration system that automates the build/test cycle"; maintainers = with maintainers; [ nand0p ryansydnor ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 2875f6942a9e..f2fdd1535bfd 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi"; + sha256 = "02949cvmghyh313i1hmplwxp3nzq789kk85xjx2ir82cpr1d6h6j"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -26,14 +26,15 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.0.post1"; + version = "0.9.3"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; - src = fetchurl { - url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl"; - sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q"; + src = pythonPackages.fetchPypi { + inherit pname version format; + python = "py2"; + sha256 = "0yggg6mcykcnv41srl2sp2zwx2r38vb6a8jgxh1a4825mspm2jf7"; }; meta = with stdenv.lib; { @@ -48,14 +49,14 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l"; + sha256 = "1rkzakm05x72nvdivc5bc3gab3nyasdfvlwnwril90jj9q1b92dk"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; meta = with stdenv.lib; { homepage = http://buildbot.net/; @@ -69,14 +70,14 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g"; + sha256 = "033x2cs0znhk1j0lw067nmjw2m7yy1fdq5qch0sx50jnpjiq6g6g"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; meta = with stdenv.lib; { homepage = http://buildbot.net/; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 7d7ecc1c52d3..861ed647c5df 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, gnused, coreutils, pythonPackages }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx"; + sha256 = "176kp04g4c7gj15f73wppraqrirbfclyx214gcz966019niikcsp"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; propagatedBuildInputs = with pythonPackages; [ twisted future ]; + postPatch = '' + ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot_worker/scripts/logwatcher.py + ''; + meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; |