commit 9e48fc3268fcaf7a7cde724eaf38d246abad9b5d · pyrox.dev/nixpkgs

+22 -25

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

···

       12
       12
        
           factory = util.BuildFactory()

     

       13
       13
        
           c = BuildmasterConfig = dict(

     

       14
       14
        
            workers       = [${concatStringsSep "," cfg.workers}],

     

       15
       15
       -
            protocols     = { 'pb': {'port': ${cfg.bpPort} } },

     

       15
       15
       +
            protocols     = { 'pb': {'port': ${toString cfg.bpPort} } },

     

       16
       16
        
            title         = '${escapeStr cfg.title}',

     

       17
       17
        
            titleURL      = '${escapeStr cfg.titleUrl}',

     

       18
       18
        
            buildbotURL   = '${escapeStr cfg.buildbotUrl}',

     
···

       62
       62
        
             extraConfig = mkOption {

     

       63
       63
        
               type = types.str;

     

       64
       64
        
               description = "Extra configuration to append to master.cfg";

     

       65
       65
       -
               default = "";

     

       65
       65
       +
               default = "c['buildbotNetUsageData'] = None";

     

       66
       66
        
             };

     

       67
       67
        
       

     

       68
       68
        
             masterCfg = mkOption {

     
···

       92
       92
        
             workers = mkOption {

     

       93
       93
        
               type = types.listOf types.str;

     

       94
       94
        
               description = "List of Workers.";

     

       95
       95
       -
               default = [

     

       96
       96
       -
                 "worker.Worker('example-worker', 'pass')"

     

       97
       97
       -
               ];

     

       98
       98
       -
               example = [ "worker.LocalWorker('example-worker')" ];

     

       95
       95
       +
               default = [ "worker.Worker('example-worker', 'pass')" ];

     

       99
       96
        
             };

     

       100
       97
        
       

     

       101
       98
        
             status = mkOption {

     
···

       135
       132
        
             };

     

       136
       133
        
       

     

       137
       134
        
             bpPort = mkOption {

     

       138
       138
       -
               default = "9989";

     

       139
       139
       -
               type = types.string;

     

       140
       140
       -
               example = "tcp:10000:interface=127.0.0.1";

     

       135
       135
       +
               default = 9989;

     

       136
       136
       +
               type = types.int;

     

       141
       137
        
               description = "Port where the master will listen to Buildbot Worker.";

     

       142
       138
        
             };

     

       143
       139
        
       

     
···

       179
       175
        
       

     

       180
       176
        
             package = mkOption {

     

       181
       177
        
               type = types.package;

     

       182
       182
       -
               default = pkgs.buildbot-ui;

     

       183
       183
       -
               defaultText = "pkgs.buildbot-ui";

     

       178
       178
       +
               default = pkgs.buildbot-full;

     

       179
       179
       +
               defaultText = "pkgs.buildbot-full";

     

       184
       180
        
               description = "Package to use for buildbot.";

     

       185
       181
        
               example = literalExample "pkgs.buildbot-full";

     

       186
       182
        
             };

     

       187
       183
        
       

     

       188
       184
        
             packages = mkOption {

     

       189
       189
       -
               default = [ ];

     

       185
       185
       +
               default = with pkgs; [ python27Packages.twisted git ];

     

       190
       186
        
               example = literalExample "[ pkgs.git ]";

     

       191
       187
        
               type = types.listOf types.package;

     

       192
       188
        
               description = "Packages to add to PATH for the buildbot process.";

     
···

       212
       208
        
       

     

       213
       209
        
           systemd.services.buildbot-master = {

     

       214
       210
        
             description = "Buildbot Continuous Integration Server.";

     

       215
       215
       -
             after = [ "network.target" ];

     

       211
       211
       +
             after = [ "network-online.target" ];

     

       216
       212
        
             wantedBy = [ "multi-user.target" ];

     

       217
       213
        
             path = cfg.packages;

     

       218
       214
        
       

     

       215
       215
       +
             preStart = ''

     

       216
       216
       +
               env > envvars

     

       217
       217
       +
               mkdir -vp ${cfg.buildbotDir}

     

       218
       218
       +
               ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg

     

       219
       219
       +
               rm -fv $cfg.buildbotDir}/buildbot.tac

     

       220
       220
       +
               ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}

     

       221
       221
       +
             '';

     

       222
       222
       +
       

     

       219
       223
        
             serviceConfig = {

     

       220
       224
        
               Type = "simple";

     

       221
       225
        
               User = cfg.user;

     

       222
       226
        
               Group = cfg.group;

     

       223
       227
        
               WorkingDirectory = cfg.home;

     

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

     

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

     

       225
       233
        
             };

     

       226
       234
        
       

     

       227
       227
       -
             preStart = ''

     

       228
       228
       -
               ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir}

     

       229
       229
       -
               ${pkgs.coreutils}/bin/ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg

     

       230
       230
       -
               ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}

     

       231
       231
       -
             '';

     

       232
       232
       -
       

     

       233
       233
       -
             postStart = ''

     

       234
       234
       -
               until [[ $(${pkgs.curl}/bin/curl -s --head -w '\n%{http_code}' http://localhost:${toString cfg.port} | tail -n1) =~ ^(200|403)$ ]]; do

     

       235
       235
       -
                 sleep 1

     

       236
       236
       -
               done

     

       237
       237
       -
             '';

     

       238
       235
        
           };

     

       239
       236
        
         };

     

       240
       237

+8 -3

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

···

       74
       74
        
             };

     

       75
       75
        
       

     

       76
       76
        
             packages = mkOption {

     

       77
       77
       -
               default = [ ];

     

       77
       77
       +
               default = with pkgs; [ python27Packages.twisted git ];

     

       78
       78
        
               example = literalExample "[ pkgs.git ]";

     

       79
       79
        
               type = types.listOf types.package;

     

       80
       80
        
               description = "Packages to add to PATH for the buildbot process.";

     
···

       106
       106
        
             path = cfg.packages;

     

       107
       107
        
       

     

       108
       108
        
             preStart = ''

     

       109
       109
       -
               ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir}

     

       109
       109
       +
               mkdir -vp ${cfg.buildbotDir}

     

       110
       110
       +
               rm -fv $cfg.buildbotDir}/buildbot.tac

     

       110
       111
        
               ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass}

     

       111
       112
        
             '';

     

       112
       113
        
       

     
···

       115
       116
        
               User = cfg.user;

     

       116
       117
        
               Group = cfg.group;

     

       117
       118
        
               WorkingDirectory = cfg.home;

     

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

     

       119
       119
       +
               Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages";

     

       120
       120
       +
       

     

       121
       121
       +
               # NOTE: call twistd directly with stdout logging for systemd

     

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

     

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

     

       119
       124
        
             };

     

       120
       125
        
       

     

       121
       126
        
           };

+80 -15

nixos/tests/buildbot.nix

···

       4
       4
        
         name = "buildbot";

     

       5
       5
        
       

     

       6
       6
        
         nodes = {

     

       7
       7
       -
           bbmaster = { config, pkgs, nodes, ... }: {

     

       7
       7
       +
           bbmaster = { config, pkgs, ... }: {

     

       8
       8
        
             services.buildbot-master = {

     

       9
       9
        
               enable = true;

     

       10
       10
       +
               package = pkgs.buildbot-full;

     

       11
       11
       +
       

     

       12
       12
       +
               # NOTE: use fake repo due to no internet in hydra ci

     

       10
       13
        
               factorySteps = [

     

       11
       11
       -
                 "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')"

     

       12
       12
       -
                 "steps.ShellCommand(command=['trial', 'pyflakes'])"

     

       14
       14
       +
                 "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"

     

       15
       15
       +
                 "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"

     

       13
       16
        
               ];

     

       14
       17
        
               changeSource = [

     

       15
       15
       -
                 "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"

     

       18
       18
       +
                 "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"

     

       16
       19
        
               ];

     

       17
       20
        
             };

     

       18
       18
       -
             networking.firewall.allowedTCPPorts = [ 8010 9989 ];

     

       21
       21
       +
             networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];

     

       22
       22
       +
             environment.systemPackages = with pkgs; [ git buildbot-full ];

     

       19
       23
        
           };

     

       20
       24
        
       

     

       21
       25
        
           bbworker = { config, pkgs, ... }: {

     
···

       23
       27
        
               enable = true;

     

       24
       28
        
               masterUrl = "bbmaster:9989";

     

       25
       29
        
             };

     

       30
       30
       +
             environment.systemPackages = with pkgs; [ git buildbot-worker ];

     

       31
       31
       +
           };

     

       32
       32
       +
       

     

       33
       33
       +
           gitrepo = { config, pkgs, ... }: {

     

       34
       34
       +
             services.openssh.enable = true;

     

       35
       35
       +
             networking.firewall.allowedTCPPorts = [ 22 9418 ];

     

       36
       36
       +
             environment.systemPackages = with pkgs; [ git ];

     

       26
       37
        
           };

     

       27
       38
        
         };

     

       28
       39
        
       

     

       29
       40
        
         testScript = ''

     

       41
       41
       +
           #Start up and populate fake repo

     

       42
       42
       +
           $gitrepo->waitForUnit("multi-user.target");

     

       43
       43
       +
           print($gitrepo->execute(" \

     

       44
       44
       +
             git config --global user.name 'Nobody Fakeuser' && \

     

       45
       45
       +
             git config --global user.email 'nobody\@fakerepo.com' && \

     

       46
       46
       +
             rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \

     

       47
       47
       +
             mkdir -pv /srv/repos/fakerepo ~/.ssh && \

     

       48
       48
       +
             ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \

     

       49
       49
       +
             cat ~/.ssh/known_hosts && \

     

       50
       50
       +
             cd /srv/repos/fakerepo && \

     

       51
       51
       +
             git init && \

     

       52
       52
       +
             echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \

     

       53
       53
       +
             cat fakerepo.sh && \

     

       54
       54
       +
             touch .git/git-daemon-export-ok && \

     

       55
       55
       +
             git add fakerepo.sh .git/git-daemon-export-ok && \

     

       56
       56
       +
             git commit -m fakerepo && \

     

       57
       57
       +
             git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \

     

       58
       58
       +
           "));

     

       30
       59
        
       

     

       31
       31
       -
           $bbmaster->waitForUnit("network.target");

     

       32
       32
       -
           $bbworker->waitForUnit("network.target");

     

       60
       60
       +
           # Test gitrepo

     

       61
       61
       +
           $bbmaster->waitForUnit("network-online.target");

     

       62
       62
       +
           #$bbmaster->execute("nc -z gitrepo 9418");

     

       63
       63
       +
           print($bbmaster->execute(" \

     

       64
       64
       +
             rm -rfv /tmp/fakerepo && \

     

       65
       65
       +
             git clone git://gitrepo/fakerepo /tmp/fakerepo && \

     

       66
       66
       +
             pwd && \

     

       67
       67
       +
             ls -la && \

     

       68
       68
       +
             ls -la /tmp/fakerepo \

     

       69
       69
       +
           "));

     

       70
       70
       +
       

     

       71
       71
       +
           # Test start master and connect worker

     

       72
       72
       +
           $bbmaster->waitForUnit("buildbot-master.service");

     

       73
       73
       +
           $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;

     

       74
       74
       +
           $bbworker->waitForUnit("network-online.target");

     

       75
       75
       +
           $bbworker->execute("nc -z bbmaster 8010");

     

       76
       76
       +
           $bbworker->execute("nc -z bbmaster 9989");

     

       77
       77
       +
           $bbworker->waitForUnit("buildbot-worker.service");

     

       78
       78
       +
           print($bbworker->execute("ls -la /home/bbworker/worker"));

     

       79
       79
       +
       

     

       80
       80
       +
       

     

       81
       81
       +
           # Test stop buildbot master and worker

     

       82
       82
       +
           print($bbmaster->execute(" \

     

       83
       83
       +
             systemctl -l --no-pager status buildbot-master && \

     

       84
       84
       +
             systemctl stop buildbot-master \

     

       85
       85
       +
           "));

     

       86
       86
       +
           $bbworker->fail("nc -z bbmaster 8010");

     

       87
       87
       +
           $bbworker->fail("nc -z bbmaster 9989");

     

       88
       88
       +
           print($bbworker->execute(" \

     

       89
       89
       +
             systemctl -l --no-pager status buildbot-worker && \

     

       90
       90
       +
             systemctl stop buildbot-worker && \

     

       91
       91
       +
             ls -la /home/bbworker/worker \

     

       92
       92
       +
           "));

     

       93
       93
       +
       

     

       33
       94
        
       

     

       34
       34
       -
           # Additional tests to be added

     

       35
       35
       -
           #$bbmaster->waitForUnit("buildbot-master.service");

     

       36
       36
       -
           #$bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/ or die;

     

       37
       37
       -
           #$bbworker->waitForUnit("buildbot-worker.service");

     

       38
       38
       -
           #$bbworker->waitUntilSucceeds("tail -10 /home/bbworker/worker/twistd.log") =~ /success/ or die;

     

       95
       95
       +
           # Test buildbot daemon mode

     

       96
       96
       +
           # NOTE: daemon mode tests disabled due to broken PYTHONPATH child inheritence

     

       97
       97
       +
           #

     

       98
       98
       +
           #$bbmaster->execute("buildbot create-master /tmp");

     

       99
       99
       +
           #$bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");

     

       100
       100
       +
           #$bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");

     

       101
       101
       +
           #$bbmaster->execute("buildbot start /tmp");

     

       102
       102
       +
           #$bbworker->execute("nc -z bbmaster 8011");

     

       103
       103
       +
           #$bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;

     

       104
       104
       +
           #$bbmaster->execute("buildbot stop /tmp");

     

       105
       105
       +
           #$bbworker->fail("nc -z bbmaster 8011");

     

       39
       106
        
       

     

       40
       107
        
         '';

     

       41
       108
        
       

     

       42
       42
       -
         meta = with pkgs.stdenv.lib.maintainers; {

     

       43
       43
       -
           maintainers = [ nand0p ];

     

       44
       44
       -
         };

     

       109
       109
       +
         meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];

     

       45
       110
        
       

     

       46
       111
        
       })

+14 -3

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

···

       5
       5
        
           buildInputs = [ makeWrapper ] ++ plugins;

     

       6
       6
        
           passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);

     

       7
       7
        
         } ''

     

       8
       8
       -
           makeWrapper ${package}/bin/buildbot $out/bin/buildbot --prefix PYTHONPATH : $PYTHONPATH

     

       8
       8
       +
           makeWrapper ${package}/bin/buildbot $out/bin/buildbot \

     

       9
       9
       +
             --prefix PYTHONPATH : "${package}/lib/python2.7/site-packages:$PYTHONPATH"

     

       10
       10
       +
           ln -sfv ${package}/lib $out/lib

     

       9
       11
        
         '';

     

       10
       12
        
       

     

       11
       13
        
         package = pythonPackages.buildPythonApplication (rec {

     

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

     

       13
       15
        
           pname = "buildbot";

     

       14
       14
       -
           version = "0.9.4";

     

       16
       16
       +
           version = "0.9.5";

     

       15
       17
        
       

     

       16
       18
        
           src = pythonPackages.fetchPypi {

     

       17
       19
        
             inherit pname version;

     

       18
       18
       -
             sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086";

     

       20
       20
       +
             sha256 = "11r553nmh87a9pm58wycimapk2pw9hnlc7hffn97xwbqprd8qh66";

     

       19
       21
        
           };

     

       20
       22
        
       

     

       21
       23
        
           buildInputs = with pythonPackages; [

     
···

       49
       51
        
             txaio

     

       50
       52
        
             autobahn

     

       51
       53
        
             pyjwt

     

       54
       54
       +
             distro

     

       52
       55
        
       

     

       53
       56
        
             # tls

     

       54
       57
        
             pyopenssl

     
···

       68
       71
        
       

     

       69
       72
        
           postPatch = ''

     

       70
       73
        
             substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"

     

       74
       74
       +
       

     

       75
       75
       +
             # NOTE: secrets management tests currently broken

     

       76
       76
       +
             rm -fv buildbot/test/integration/test_integration_secrets.py

     

       77
       77
       +
             rm -fv buildbot/test/integration/test_integration_secrets_with_vault.py

     

       78
       78
       +
             rm -fv buildbot/test/unit/test_fake_secrets_manager.py

     

       79
       79
       +
             rm -fv buildbot/test/unit/test_interpolate_secrets.py

     

       80
       80
       +
             rm -fv buildbot/test/unit/test_secret_in_file.py

     

       81
       81
       +
             rm -fv buildbot/test/unit/test_secret_in_vault.py

     

       71
       82
        
           '';

     

       72
       83
        
       

     

       73
       84
        
           passthru = { inherit withPlugins; };

+15 -16

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

···

       1
       1
       -
       { stdenv, fetchurl, pythonPackages }:

     

       1
       1
       +
       { stdenv, pythonPackages }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         buildbot-pkg = pythonPackages.buildPythonPackage rec {

     

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

     

       6
       6
        
           pname = "buildbot-pkg";

     

       7
       7
       -
           version = "0.9.4";

     

       7
       7
       +
           version = "0.9.5";

     

       8
       8
        
       

     

       9
       9
       -
           src = fetchurl {

     

       10
       10
       -
             url = "mirror://pypi/b/${pname}/${name}.tar.gz";

     

       11
       11
       -
             sha256 = "09a3yvs5hhf8syrkyydznmymgg86dpvgrwy9rb3bryq00wpjb3wn";

     

       9
       9
       +
           src = pythonPackages.fetchPypi {

     

       10
       10
       +
             inherit pname version;

     

       11
       11
       +
             sha256 = "1xpi4w0lc6z97pmmms85dvdspacbzlvs8zi3kv1r4rypk3znwmi1";

     

       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.4";

     

       28
       28
       +
           version = "0.9.5";

     

       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
       -
             python = "py2";

     

       36
       36
       -
             sha256 = "08m4h2pf6hgi8igh2j0qzfq49izc2z0qqj6ddxk0di5l306jx4im";

     

       35
       35
       +
             sha256 = "1d7yjxka6slflm3wbdpq4sr1kagmgbqdv2zgx9bq77jvjh7ga0py";

     

       37
       36
        
           };

     

       38
       37
        
       

     

       39
       38
        
           meta = with stdenv.lib; {

     
···

       47
       46
        
         console-view = pythonPackages.buildPythonPackage rec {

     

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

     

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

     

       50
       50
       -
           version = "0.9.4";

     

       49
       49
       +
           version = "0.9.5";

     

       51
       50
        
       

     

       52
       52
       -
           src = fetchurl {

     

       53
       53
       -
             url = "mirror://pypi/b/${pname}/${name}.tar.gz";

     

       54
       54
       -
             sha256 = "1w2vv8iyzl7ak4161avp9n6mhh08adav2fl82bbm17a3064apl8n";

     

       51
       51
       +
           src = pythonPackages.fetchPypi {

     

       52
       52
       +
             inherit pname version;

     

       53
       53
       +
             sha256 = "1s6mvw955dsgk7hvb1xa32bbd7w2yma62py5s0vmi5shv8nwq3hb";

     

       55
       54
        
           };

     

       56
       55
        
       

     

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

     
···

       67
       66
        
         waterfall-view = pythonPackages.buildPythonPackage rec {

     

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

     

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

     

       70
       70
       -
           version = "0.9.4";

     

       69
       69
       +
           version = "0.9.5";

     

       71
       70
        
       

     

       72
       72
       -
           src = fetchurl {

     

       73
       73
       -
             url = "mirror://pypi/b/${pname}/${name}.tar.gz";

     

       74
       74
       -
             sha256 = "17xn6vrr0k2xabw6hr9sdyy0ry3llyjfmc79qrpgp5bsly2qv3jf";

     

       71
       71
       +
           src = pythonPackages.fetchPypi {

     

       72
       72
       +
             inherit pname version;

     

       73
       73
       +
             sha256 = "116846d987wp1bz78f0h4lypqcns5073vzhb4vsqbf08sppgr67k";

     

       75
       74
        
           };

     

       76
       75
        
       

     

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

+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.4";

     

       6
       6
       +
         version = "0.9.5";

     

       7
       7
        
       

     

       8
       8
        
         src = pythonPackages.fetchPypi {

     

       9
       9
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj";

     

       10
       10
       +
           sha256 = "1al7jam351sf781axj4kfhj70cc0g21zv81ynk410kdccjyxp2dy";

     

       11
       11
        
         };

     

       12
       12
        
       

     

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