public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildbot: 2.6.0 -> 2.7.0 (#81406)

Browse Source
This commit is contained in:
Ben Wolsieffer 2020-02-29 18:24:02 -05:00 committed by GitHub
parent b209cc7f76
commit 07727dbd16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/buildbot.nix
View File

@ -41,7 +41,7 @@ import ./make-test-python.nix {
systemd.services.git-daemon = { systemd.services.git-daemon = {
description = "Git daemon for the test"; description = "Git daemon for the test";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" "sshd.service" ];
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
path = with pkgs; [ coreutils git openssh ]; path = with pkgs; [ coreutils git openssh ];

3
pkgs/development/python-modules/buildbot/default.nix
View File

@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
parameterized, git, openssh, glibcLocales }: parameterized, git, openssh, glibcLocales, nixosTests }:
let let
withPlugins = plugins: buildPythonPackage { withPlugins = plugins: buildPythonPackage {
@ -91,6 +91,7 @@ let
passthru = { passthru = {
inherit withPlugins; inherit withPlugins;
tests.buildbot = nixosTests.buildbot;
}; };
meta = with lib; { meta = with lib; {

4
pkgs/development/python-modules/buildbot/pkg.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "buildbot-pkg"; pname = "buildbot-pkg";
version = "2.6.0"; version = "2.7.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z"; sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb";
}; };
postPatch = '' postPatch = ''

14
pkgs/development/python-modules/buildbot/plugins.nix
View File

@ -7,14 +7,12 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg"; sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi";
}; };
# Remove unneccessary circular dependency on buildbot # Remove unneccessary circular dependency on buildbot
postPatch = '' postPatch = ''
sed -i setup.py \ sed -i "s/'buildbot'//" setup.py
-e "/import buildbot/d" \
-e "s/'buildbot',//"
''; '';
buildInputs = [ buildbot-pkg mock ]; buildInputs = [ buildbot-pkg mock ];
@ -36,7 +34,7 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10"; sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8";
}; };
buildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
@ -58,7 +56,7 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb"; sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58";
}; };
buildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
@ -80,7 +78,7 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh"; sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4";
}; };
buildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];
@ -102,7 +100,7 @@
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r"; sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg";
}; };
buildInputs = [ buildbot-pkg ]; buildInputs = [ buildbot-pkg ];

4
pkgs/development/python-modules/buildbot/worker.nix
View File

@ -3,11 +3,11 @@
buildPythonPackage (rec { buildPythonPackage (rec {
pname = "buildbot-worker"; pname = "buildbot-worker";
version = "2.6.0"; version = "2.7.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l"; sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6";
}; };
propagatedBuildInputs = [ twisted future ]; propagatedBuildInputs = [ twisted future ];