3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #105935 from lopsided98/buildbot-update

buildbot: 2.8.4-> 2.9.2
This commit is contained in:
Dmitry Kalinkin 2020-12-09 17:35:58 -05:00 committed by GitHub
commit 29d9cd8121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 50 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k,
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
parameterized, git, openssh, glibcLocales, nixosTests }:
@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "2.8.4";
version = "2.9.2";
src = fetchPypi {
inherit pname version;
sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv";
sha256 = "019xfxjnyfi69d5sm3alvib24g8giqlvc102p8hqg8mfm7hc9z2v";
};
propagatedBuildInputs = [
@ -51,7 +51,7 @@ let
checkInputs = [
treq
txrequests
pyjade
pypugjs
boto3
moto
mock
@ -73,13 +73,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
# fix compatibility with the latest SQLAlchemy
(fetchpatch {
url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch";
sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n";
stripLen = 1;
})
];
postPatch = ''

View file

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc";
sha256 = "01s58zi72drv4lwn6jg6i5mrpf3mpq74761z6iwx5hsdnqg1hxai";
};
postPatch = ''
@ -15,6 +15,11 @@ buildPythonPackage rec {
substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
'';
# No tests
doCheck = false;
pythonImportsCheck = [ "buildbot_pkg" ];
disabled = !isPy3k;
meta = with lib; {

View file

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s";
sha256 = "1z5sca2ksbr1j6p0kr8i9a61c46mdmbbd6hvc6407c3z5393mp30";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h";
sha256 = "1kz54zlc2yr9cjvw7rihcx7hfk245r6yh4mfyala38jby3hd68p0";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj";
sha256 = "0ac0dzldxl4j9cb4kpmhjwf5m1zjjvcg0hx9kghallab0sk1198p";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz";
sha256 = "1m41l2d6yb4mbg1ybn7q6wmkfvwssmfb4inmpwyvy55bcvgyixcm";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn";
sha256 = "1g58kr2zc7k94k0avly0vyyryg18gpsbick8mj5cz81s2pfmmyfq";
};
buildInputs = [ buildbot-pkg ];

View file

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib";
sha256 = "1salrdirny1jpm53shb9dhzs1w7rbp5q7z2qpzrg1nmsh2kcd6ap";
};
propagatedBuildInputs = [ twisted future ];

View file

@ -1,29 +0,0 @@
{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2
, tornado, pyramid, Mako, six }:
buildPythonPackage rec {
pname = "pyjade";
version = "4.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
};
buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
propagatedBuildInputs = [ six ];
postPatch = ''
sed -i 's/1.4.99/1.99/' setup.py
'';
checkPhase = ''
nosetests pyjade
'';
# No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
doCheck = false;
meta = with stdenv.lib; {
description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
homepage = "https://github.com/syrusakbary/pyjade";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
, django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
buildPythonPackage rec {
pname = "pypugjs";
version = "5.9.8";
src = fetchPypi {
inherit pname version;
sha256 = "1iy8k56rbslxcylhamdik2bd6gqqirrix55mrdn29zz9gl6vg1xi";
};
propagatedBuildInputs = [ six chardet ];
checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ];
checkPhase = ''
nosetests pypugjs
'';
meta = with stdenv.lib; {
description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates";
homepage = "https://github.com/kakulukia/pypugjs";
license = licenses.mit;
maintainers = with maintainers; [ lopsided98 ];
};
}

View file

@ -5230,8 +5230,6 @@ in {
pyipp = callPackage ../development/python-modules/pyipp { };
pyjade = callPackage ../development/python-modules/pyjade { };
pyjet = callPackage ../development/python-modules/pyjet { };
pyjks = callPackage ../development/python-modules/pyjks { };
@ -5468,6 +5466,8 @@ in {
pypubsub = callPackage ../development/python-modules/pypubsub { };
pypugjs = callPackage ../development/python-modules/pypugjs { };
pyqrcode = callPackage ../development/python-modules/pyqrcode { };
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; };