From 02a5a13972701ca185deaa2b34a7ef1fe7d19a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 May 2023 21:06:55 +0200 Subject: [PATCH] buildbot: 3.7.0 -> 3.8.0 --- .../continuous-integration/buildbot/master.nix | 4 ++-- .../continuous-integration/buildbot/pkg.nix | 2 +- .../continuous-integration/buildbot/plugins.nix | 14 ++++++++------ .../continuous-integration/buildbot/update.sh | 17 +++++++++-------- .../continuous-integration/buildbot/worker.nix | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 6e59e31867b6..eacf45074f4f 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -65,14 +65,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.7.0"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4="; + hash = "sha256-Z4BmC6Ed+7y4rJologiLXhkIvucXz65KEBxX3LFqExY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 13c0ec869485..a72ae5120438 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU="; + hash = "sha256-duv8oKgVGfeOzjKiI8Ltmto0dcGSI1xtSy8YbqtIFTk="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 42a77fa0f4bc..15e9ebbe20bb 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -1,12 +1,14 @@ { lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: { + # this is exposed for potential plugins to use and for nix-update + inherit buildbot-pkg; www = buildPythonPackage rec { pname = "buildbot-www"; inherit (buildbot-pkg) version; src = fetchPypi { inherit pname version; - hash = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0="; + hash = "sha256-6hLJADdd84LTpxVB8C+i8rea9/65QfcCPuZC/7+55Co="; }; # Remove unnecessary circular dependency on buildbot @@ -33,7 +35,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k="; + hash = "sha256-JA+3WnZAN4224LbrluHJcnTmQ8VnuAmoEqqLtw0H10M="; }; buildInputs = [ buildbot-pkg ]; @@ -55,7 +57,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA="; + hash = "sha256-NwLb9aQQwOxo9AqvsYbl/g8mNUeufdPrCwFMJNzdfQM="; }; buildInputs = [ buildbot-pkg ]; @@ -77,7 +79,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg="; + hash = "sha256-hIBH8+RvZ53Txxl2FyrCs+ZFzRAAbK2th5Im2gZCs3c="; }; buildInputs = [ buildbot-pkg ]; @@ -99,7 +101,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo="; + hash = "sha256-iK9MwE5Nzc0tHMui0LquCqTFIPbRTEYeHam+5hiOQJE="; }; buildInputs = [ buildbot-pkg ]; @@ -121,7 +123,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug="; + hash = "sha256-HtVleYQE+pfwso7oBNucRjHEkwjgQSZJ6Ts1x7ncLsA="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index 3406f05db3e8..a295993607a8 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -2,11 +2,12 @@ #!nix-shell -i bash -p nix-update set -eu -o pipefail -nix-update python3Packages.buildbot -nix-update --version=skip python3Packages.buildbot-worker -nix-update --version=skip python3Packages.buildbot-pkg -nix-update --version=skip python3Packages.buildbot-plugins.www -nix-update --version=skip python3Packages.buildbot-plugins.console-view -nix-update --version=skip python3Packages.buildbot-plugins.waterfall-view -nix-update --version=skip python3Packages.buildbot-plugins.grid-view -nix-update --version=skip python3Packages.buildbot-plugins.wsgi-dashboards +nix-update buildbot +nix-update --version=skip buildbot-worker +nix-update --version=skip buildbot-plugins.buildbot-pkg +nix-update --version=skip buildbot-plugins.www +nix-update --version=skip buildbot-plugins.console-view +nix-update --version=skip buildbot-plugins.waterfall-view +nix-update --version=skip buildbot-plugins.grid-view +nix-update --version=skip buildbot-plugins.wsgi-dashboards +nix-update --version=skip buildbot-plugins.badges diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 3ea0feb293ec..baf34ad683e0 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM="; + hash = "sha256-et0R0pNxtL5QCgHRT1/q5t+hb6cLl6NU3AowzT/WC90="; }; postPatch = ''