From f9b369ec2e18b9afaf20cd081ef0e48e5e393b23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Dec 2022 06:27:18 +0000 Subject: [PATCH 1/4] python310Packages.buildbot: 3.6.1 -> 3.7.0 --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index b1add1a764c0..036759bc1d59 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -33,11 +33,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ByJPkI0AHis+Ey1lSuMly4M6W4s/xes4eG0gPPJ3fZA="; + sha256 = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 2abe2979ccb9..3b16184ae702 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YmAO8o25uVk1KlyzFg79025KyiopXxWZVpfrvI0H8c4="; + sha256 = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index a493d75f8562..4aee37e102ca 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-MXCLaFXmZCzLp3nuzK2PW4aa1CC5JOXkvvswAbMwkXI="; + sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-U89IyfhgIjrf6XH5pFod89zDE9Ln817AHMBCRTPw4tQ="; + sha256 = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-vbf4mMbgCePXlPwQQWeC7knBP1WZhhhEggy1ULNESG8="; + sha256 = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-haLbaeE1aKhHRT5UsKABBeNBRRvt7bVKalT3doQU7SI="; + sha256 = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-zarpv8kwJMFwfZYA+EqEc7636tKud9wXfAbrlZM4bB4="; + sha256 = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 91c29e31d61b..9099af82f374 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-13I7sttnxO6vORFZzpOKmXu3PfwOpSGmXqvozrhzIm0="; + sha256 = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM="; }; postPatch = '' From 96b6cfb7be83440302a2800337bfae23ddad9ab8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Dec 2022 09:08:35 +0100 Subject: [PATCH 2/4] python310Packages.buildbot: add changelog to meta - specify license - update disabled --- .../python-modules/buildbot/default.nix | 56 +++++++++++++++---- 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 036759bc1d59..ed6f37b5e644 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,8 +1,35 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k -, python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic -, python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs -, boto3, moto, mock, lz4, setuptoolsTrial -, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, makeWrapper +, pythonOlder +, python +, twisted +, jinja2 +, msgpack +, zope_interface +, sqlalchemy +, alembic +, python-dateutil +, txaio +, autobahn +, pyjwt +, pyyaml +, treq +, txrequests +, pypugjs +, boto3 +, moto +, mock +, lz4 +, setuptoolsTrial +, buildbot-worker +, buildbot-pkg +, buildbot-plugins +, parameterized +, git +, openssh , glibcLocales , nixosTests }: @@ -17,7 +44,10 @@ let dontBuild = true; doCheck = false; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; + propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = '' @@ -34,10 +64,13 @@ let package = buildPythonPackage rec { pname = "buildbot"; version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4="; + hash = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4="; }; propagatedBuildInputs = [ @@ -96,8 +129,6 @@ let rm buildbot/test/integration/test_graphql.py ''; - disabled = !isPy3k; - passthru = { inherit withPlugins; tests.buildbot = nixosTests.buildbot; @@ -105,11 +136,12 @@ let }; meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://buildbot.net/"; description = "An open-source continuous integration framework for automating software build, test, and release processes"; + homepage = "https://buildbot.net/"; + changelog = "https://github.com/buildbot/buildbot/releases/tag/v${version}"; maintainers = with maintainers; [ ryansydnor lopsided98 ]; - license = licenses.gpl2; + license = licenses.gpl2Only; + broken = stdenv.isDarwin; }; }; in package From 108f679f4f80689571205adf375607b0bac49cc2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Dec 2022 09:14:27 +0100 Subject: [PATCH 3/4] python310Packages.buildbot: fix lint issues --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index ed6f37b5e644..c68595dcec88 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -47,7 +47,7 @@ let nativeBuildInputs = [ makeWrapper ]; - + propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = '' @@ -65,7 +65,7 @@ let pname = "buildbot"; version = "3.7.0"; format = "setuptools"; - + disabled = pythonOlder "3.7"; src = fetchPypi { From 18c786729c2f90bea00fd3d7b6c0380a27fcc6ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Dec 2022 10:19:14 +0100 Subject: [PATCH 4/4] python310Packages.buildbot: remove whitespace --- pkgs/development/python-modules/buildbot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c68595dcec88..c30e54aca998 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -47,7 +47,7 @@ let nativeBuildInputs = [ makeWrapper ]; - + propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; installPhase = ''