commit f6a7b851d4f646ad6770beaa54556dd882c9bde0 · pyrox.dev/nixpkgs

+1 -5

nixos/modules/services/continuous-integration/buildbot/master.nix

···

       225
       225
        
               User = cfg.user;

     

       226
       226
        
               Group = cfg.group;

     

       227
       227
        
               WorkingDirectory = cfg.home;

     

       228
       228
       -
               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";

     

       229
       229
       -
       

     

       230
       230
       -
               # NOTE: call twistd directly with stdout logging for systemd

     

       231
       231
       -
               #ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";

     

       232
       232
       -
               ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac";

     

       228
       228
       +
               ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";

     

       233
       229
        
             };

     

       234
       230
        
       

     

       235
       231
        
           };

+3 -3

pkgs/development/tools/build-managers/buildbot/default.nix

···

       13
       13
        
         package = pythonPackages.buildPythonApplication (rec {

     

       14
       14
        
           name = "${pname}-${version}";

     

       15
       15
        
           pname = "buildbot";

     

       16
       16
       -
           version = "0.9.7";

     

       16
       16
       +
           version = "0.9.9.post2";

     

       17
       17
        
       

     

       18
       18
        
           src = pythonPackages.fetchPypi {

     

       19
       19
        
             inherit pname version;

     

       20
       20
       -
             sha256 = "0cwy39ap2v9kni3zm92633cnqf7qsnb4zlargx060pbfagkg1jwg";

     

       20
       20
       +
             sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w";

     

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
           buildInputs = with pythonPackages; [

     
···

       83
       83
        
       

     

       84
       84
        
           meta = with stdenv.lib; {

     

       85
       85
        
             homepage = http://buildbot.net/;

     

       86
       86
       -
             description = "Continuous integration system that automates the build/test cycle";

     

       86
       86
       +
             description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";

     

       87
       87
        
             maintainers = with maintainers; [ nand0p ryansydnor ];

     

       88
       88
        
             license = licenses.gpl2;

     

       89
       89
        
           };

+29 -8

pkgs/development/tools/build-managers/buildbot/plugins.nix

···

       4
       4
        
         buildbot-pkg = pythonPackages.buildPythonPackage rec {

     

       5
       5
        
           name = "${pname}-${version}";

     

       6
       6
        
           pname = "buildbot-pkg";

     

       7
       7
       -
           version = "0.9.7";

     

       7
       7
       +
           version = "0.9.9.post2";

     

       8
       8
        
       

     

       9
       9
        
           src = pythonPackages.fetchPypi {

     

       10
       10
        
             inherit pname version;

     

       11
       11
       -
             sha256 = "0p351r10y42gwgxb2qg7xlsbhmnzdmqp6h4922l0yfii3pzmrdzv";

     

       11
       11
       +
             sha256 = "1h24fzyr4kfm1nb2627hgg9nl5mwv1gihc3f2wb5000gxmjdasg8";

     

       12
       12
        
           };

     

       13
       13
        
       

     

       14
       14
        
           propagatedBuildInputs = with pythonPackages; [ setuptools ];

     
···

       25
       25
        
         www = pythonPackages.buildPythonPackage rec {

     

       26
       26
        
           name = "${pname}-${version}";

     

       27
       27
        
           pname = "buildbot_www";

     

       28
       28
       -
           version = "0.9.7";

     

       28
       28
       +
           version = "0.9.9.post2";

     

       29
       29
        
       

     

       30
       30
        
           # NOTE: wheel is used due to buildbot circular dependency

     

       31
       31
        
           format = "wheel";

     

       32
       32
        
       

     

       33
       33
        
           src = pythonPackages.fetchPypi {

     

       34
       34
        
             inherit pname version format;

     

       35
       35
       -
             sha256 = "1wf2spnilm0dkyw95vf57lca453sbly4r6ak3lxa8bpwhxb6lkdn";

     

       35
       35
       +
             sha256 = "1yzk3sy9i8g8wz9vvghhxnafs5dzsd3sybmm8lg043129rh116b9";

     

       36
       36
        
           };

     

       37
       37
        
       

     

       38
       38
        
           meta = with stdenv.lib; {

     
···

       46
       46
        
         console-view = pythonPackages.buildPythonPackage rec {

     

       47
       47
        
           name = "${pname}-${version}";

     

       48
       48
        
           pname = "buildbot-console-view";

     

       49
       49
       -
           version = "0.9.7";

     

       49
       49
       +
           version = "0.9.9.post2";

     

       50
       50
        
       

     

       51
       51
        
           src = pythonPackages.fetchPypi {

     

       52
       52
        
             inherit pname version;

     

       53
       53
       -
             sha256 = "1iv77886rbbn0wlzl5qiqc08rgbymxirqh3vmimqwsabbh7fhzkm";

     

       53
       53
       +
             sha256 = "0mmlxzlzl0r97jf0g98m7k1b13mzzy80445i0biazkj0vzkpwxza";

     

       54
       54
        
           };

     

       55
       55
        
       

     

       56
       56
        
           propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];

     
···

       66
       66
        
         waterfall-view = pythonPackages.buildPythonPackage rec {

     

       67
       67
        
           name = "${pname}-${version}";

     

       68
       68
        
           pname = "buildbot-waterfall-view";

     

       69
       69
       -
           version = "0.9.7";

     

       69
       69
       +
           version = "0.9.9.post2";

     

       70
       70
        
       

     

       71
       71
        
           src = pythonPackages.fetchPypi {

     

       72
       72
        
             inherit pname version;

     

       73
       73
       -
             sha256 = "1q42l25cryx0yp6lbbl0mxnxkb9h24wawhzhi1wkc3kj8zs5sifn";

     

       73
       73
       +
             sha256 = "0pq45gddwjd61nxmr48cl8s533i4gy3wg9wzbj3g1yb30yrz8qf4";

     

       74
       74
        
           };

     

       75
       75
        
       

     

       76
       76
        
           propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];

     
···

       82
       82
        
             license = licenses.gpl2;

     

       83
       83
        
           };

     

       84
       84
        
         };

     

       85
       85
       +
       

     

       86
       86
       +
         grid-view = pythonPackages.buildPythonPackage rec {

     

       87
       87
       +
           name = "${pname}-${version}";

     

       88
       88
       +
           pname = "buildbot-grid-view";

     

       89
       89
       +
           version = "0.9.9.post2";

     

       90
       90
       +
       

     

       91
       91
       +
           src = pythonPackages.fetchPypi {

     

       92
       92
       +
             inherit pname version;

     

       93
       93
       +
             sha256 = "16y7br1yniby8yp932ildn14cxvbw5ywx36d703c4d98dmnlrpaw";

     

       94
       94
       +
           };

     

       95
       95
       +
       

     

       96
       96
       +
           propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];

     

       97
       97
       +
       

     

       98
       98
       +
           meta = with stdenv.lib; {

     

       99
       99
       +
             homepage = http://buildbot.net/;

     

       100
       100
       +
             description = "Buildbot Grid View Plugin";

     

       101
       101
       +
             maintainers = with maintainers; [ nand0p ];

     

       102
       102
       +
             license = licenses.gpl2;

     

       103
       103
       +
           };

     

       104
       104
       +
         };

     

       105
       105
       +
       

     

       85
       106
        
       }

+2 -2

pkgs/development/tools/build-managers/buildbot/worker.nix

···

       3
       3
        
       pythonPackages.buildPythonApplication (rec {

     

       4
       4
        
         name = "${pname}-${version}";

     

       5
       5
        
         pname = "buildbot-worker";

     

       6
       6
       -
         version = "0.9.7";

     

       6
       6
       +
         version = "0.9.9.post2";

     

       7
       7
        
       

     

       8
       8
        
         src = pythonPackages.fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0s62i808l13a8dprmrb2dikh7d1xvvdnw3pfhl6im0i9fc64w6x4";

     

       10
       10
       +
           sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

+1 -1

pkgs/top-level/all-packages.nix

···

       6549
       6549
        
           pythonPackages = python2Packages;

     

       6550
       6550
        
         };

     

       6551
       6551
        
         buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]);

     

       6552
       6552
       -
         buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]);

     

       6552
       6552
       +
         buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view ]);

     

       6553
       6553
        
       

     

       6554
       6554
        
         buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };

     

       6555
       6555