forked from mirrors/nixpkgs
buildbot: 3.4.1 -> 3.5.0
This commit is contained in:
parent
901a75d2d9
commit
744b46dd66
|
@ -31,11 +31,11 @@ let
|
|||
|
||||
package = buildPythonPackage rec {
|
||||
pname = "buildbot";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ=";
|
||||
sha256 = "sha256-woGHdCan5qTp00toNkWa821EgVQMrPK+OWXoqFcgIDQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,7 +6,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc=";
|
||||
sha256 = "sha256-CYbMixfZZ1xypV0J7TW54n/fja9RGMlWiF7StJYFnqM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o=";
|
||||
sha256 = "sha256-boa/MWi/HAhNU3/n96i0fuoQ+jT5I+dWoe1Zd7f/Yvs=";
|
||||
};
|
||||
|
||||
# Remove unneccessary circular dependency on buildbot
|
||||
|
@ -34,7 +34,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg=";
|
||||
sha256 = "sha256-NUDTwgkQuasOlJxNTlvfIm99LNVCrRIdBmgeJnwkSU8=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -56,7 +56,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI=";
|
||||
sha256 = "sha256-EmiIDCG4iFIwFnwii8fjII7C7wsBifzeZeW7HyY04dE=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -78,7 +78,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI=";
|
||||
sha256 = "sha256-QcS8QJ17uzDvkynTczj05LojuIT6feGiQNCwCESbVLw=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -100,7 +100,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc=";
|
||||
sha256 = "sha256-U9ecRxpDowzjD4GsrW4FUHcbNaWeAFGKDlqMrbIoTrQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
|
@ -1,5 +1,26 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted,
|
||||
future, coreutils, nixosTests }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, buildbot
|
||||
|
||||
# patch
|
||||
, coreutils
|
||||
|
||||
# propagates
|
||||
, autobahn
|
||||
, future
|
||||
, msgpack
|
||||
, twisted
|
||||
|
||||
# tests
|
||||
, mock
|
||||
, parameterized
|
||||
, psutil
|
||||
, setuptoolsTrial
|
||||
|
||||
# passthru
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
buildPythonPackage (rec {
|
||||
pname = "buildbot-worker";
|
||||
|
@ -7,18 +28,31 @@ buildPythonPackage (rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg=";
|
||||
sha256 = "sha256-HZH3TdH5dhr3f6ev25O3SgPPNbiFGMmAp9DHwcb/2MA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ twisted future ];
|
||||
|
||||
checkInputs = [ setuptoolsTrial mock ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace buildbot_worker/scripts/logwatcher.py \
|
||||
--replace /usr/bin/tail "${coreutils}/bin/tail"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptoolsTrial
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
autobahn
|
||||
future
|
||||
msgpack
|
||||
twisted
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
parameterized
|
||||
psutil
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.buildbot;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue