buildbot: 4.0.3 -> 4.1.0

Changelog:

https://github.com/buildbot/buildbot/releases/tag/v4.0.4
https://github.com/buildbot/buildbot/releases/tag/v4.1.0

pkgs/development/tools/continuous-integration/buildbot/default.nix

···
   python = python3.override {
     self = self.python;
     packageOverrides = self: super: {
-      sqlalchemy = super.sqlalchemy_1_4;
       moto = super.moto.overridePythonAttrs (oldAttrs: {
         # a lot of tests -> very slow, we already build them when building python packages
         doCheck = false;

pkgs/development/tools/continuous-integration/buildbot/master.nix

···
 , moto
 , markdown
 , lz4
+, brotli
+, zstandard
 , setuptools-trial
 , buildbot-worker
 , buildbot-plugins
···
 in
 buildPythonApplication rec {
   pname = "buildbot";
-  version = "4.0.3";
+  version = "4.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
···
     owner = "buildbot";
     repo = "buildbot";
     rev = "v${version}";
-    hash = "sha256-4jxA8qvLX53cLooCpkn9hvcz4SFGc29TKxUah80Ufp4=";
+    hash = "sha256-RPg4eXqpm/F1SSoB4MVo61DgZv/iE2R4VtCkUU69iA8=";
   };
 
   build-system = [
···
     importlib-resources
     packaging
     unidiff
+    treq
+    brotli
+    zstandard
   ]
     # tls
     ++ twisted.optional-dependencies.tls;
···
   ];
 
   postPatch = ''
-    substituteInPlace master/buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
-  '';
-  preBuild = ''
     cd master
+    touch buildbot/py.typed
+    substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
   '';
-
-  # Silence the depreciation warning from SqlAlchemy
-  SQLALCHEMY_SILENCE_UBER_WARNING = 1;
 
   # TimeoutErrors on slow machines -> aarch64
   doCheck = !stdenv.hostPlatform.isAarch64;
···
   preCheck = ''
     export LC_ALL="en_US.UTF-8"
     export PATH="$out/bin:$PATH"
-
-    # remove testfile which is missing configuration file from sdist
-    rm buildbot/test/integration/test_graphql.py
-    # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776
-    rm buildbot/test/integration/test_try_client.py
   '';
 
   passthru = {

pkgs/development/tools/continuous-integration/buildbot/plugins.nix

···
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-wBwJXDR52jDRd+8efIjQ+ncWe708k1F21MuvBwhjEwc=";
+      hash = "sha256-+ZiOkTZLdwqsZfApW6aQxoNkbcFCaB4BHEjMTZIl+Rg=";
     };
 
     # Remove unnecessary circular dependency on buildbot
···
     };
   };
 
-  www-react = buildPythonPackage rec {
-    pname = "buildbot_www_react";
-    inherit (buildbot-pkg) version;
-
-    src = fetchurl {
-      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-JJK1vmTdOImKIM1glrTjo2E0KnotU2QJVc2OIzVQQ1Y=";
-    };
-
-    # Remove unnecessary circular dependency on buildbot
-    postPatch = ''
-      sed -i "s/'buildbot'//" setup.py
-    '';
-
-    buildInputs = [ buildbot-pkg ];
-
-    # No tests
-    doCheck = false;
-
-    meta = with lib; {
-      homepage = "https://buildbot.net/";
-      description = "Buildbot UI (React)";
-      maintainers = teams.buildbot.members;
-      license = licenses.gpl2Only;
-    };
-  };
-
   console-view = buildPythonPackage rec {
     pname = "buildbot_console_view";
     inherit (buildbot-pkg) version;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-kzj4IPNn/cUW7nidOLyO7AD98uXxWcqvMxaOhXhFn74=";
+      hash = "sha256-IgG/afjU//zrcHuTXMBLlz1gCmB31fWaECIm+UqaMgA=";
     };
 
     buildInputs = [ buildbot-pkg ];
···
     };
   };
 
-  react-console-view = buildPythonPackage rec {
-    pname = "buildbot_react_console_view";
-    inherit (buildbot-pkg) version;
-
-    src = fetchurl {
-      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-4quLblPknI/vrCNF7Frl5+UlY50vuspW0XmMJubvVXI=";
-    };
-
-    buildInputs = [ buildbot-pkg ];
-
-    # tests fail
-    doCheck = false;
-
-    meta = with lib; {
-      homepage = "https://buildbot.net/";
-      description = "Buildbot Console View Plugin (React)";
-      maintainers = teams.buildbot.members;
-      license = licenses.gpl2;
-    };
-  };
-
   waterfall-view = buildPythonPackage rec {
     pname = "buildbot_waterfall_view";
     inherit (buildbot-pkg) version;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-VC84rftiA7/x0X3lJfHTrEZve/ZDncVDuq6fisEI8nc=";
+      hash = "sha256-E0yFY3PtTZ8XtJGDMh0aRljhTNsWHqHQzcBORTgrCIA=";
     };
 
     buildInputs = [ buildbot-pkg ];
···
     };
   };
 
-  react-waterfall-view = buildPythonPackage rec {
-    pname = "buildbot_react_waterfall_view";
-    inherit (buildbot-pkg) version;
-
-    src = fetchurl {
-      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-2HZBnVvxPhU6rLmG6l9hX51zm8pvA5amsjExGx65+OQ=";
-    };
-
-    buildInputs = [ buildbot-pkg ];
-
-    # tests fail
-    doCheck = false;
-
-    meta = with lib; {
-      homepage = "https://buildbot.net/";
-      description = "Buildbot Waterfall View Plugin (React)";
-      maintainers = teams.buildbot.members;
-      license = licenses.gpl2;
-    };
-  };
-
   grid-view = buildPythonPackage rec {
     pname = "buildbot_grid_view";
     inherit (buildbot-pkg) version;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-IwTANqPNGon4lvT2ASpguEf8GcD1hz/7flNBml0NTdc=";
+      hash = "sha256-KR4M7RSULCM1aS7vYjWuMXIHGpO+xFjfhC8+YncAmlE=";
     };
 
     buildInputs = [ buildbot-pkg ];
···
     };
   };
 
-  react-grid-view = buildPythonPackage rec {
-    pname = "buildbot_react_grid_view";
-    inherit (buildbot-pkg) version;
-
-    src = fetchurl {
-      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-SQiaIcupEtNePr4LUzwYm3RRKT9xa7RnHUaiE8EaRzQ=";
-    };
-
-    buildInputs = [ buildbot-pkg ];
-
-    # tests fail
-    doCheck = false;
-
-    meta = with lib; {
-      homepage = "https://buildbot.net/";
-      description = "Buildbot Grid View Plugin (React)";
-      maintainers = teams.buildbot.members;
-      license = licenses.gpl2;
-    };
-  };
-
   wsgi-dashboards = buildPythonPackage rec {
     pname = "buildbot_wsgi_dashboards";
     inherit (buildbot-pkg) version;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-dzK4WvBRxWoAfhsdKoYUnsG97OKmM8Jgr4Uv7NPpiVk=";
+      hash = "sha256-L7DayDddqrwOyBwgy4w1waCL+49GMtdrCdZNpcLrFXk=";
     };
 
     buildInputs = [ buildbot-pkg ];
···
     };
   };
 
-  react-wsgi-dashboards = buildPythonPackage rec {
-    pname = "buildbot_react_wsgi_dashboards";
-    inherit (buildbot-pkg) version;
-
-    src = fetchurl {
-      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-vytU7WRdXWHazc/LYZSWlslkOb3lnTitEW3UZQ/VmTU=";
-    };
-
-    buildInputs = [ buildbot-pkg ];
-
-    # tests fail
-    doCheck = false;
-
-    meta = with lib; {
-      homepage = "https://buildbot.net/";
-      description = "Buildbot WSGI dashboards Plugin (React)";
-      maintainers = teams.buildbot.members;
-      license = licenses.gpl2;
-    };
-  };
-
   badges = buildPythonPackage rec {
     pname = "buildbot_badges";
     inherit (buildbot-pkg) version;
 
     src = fetchurl {
       url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";
-      hash = "sha256-O71qB9uIigYcK/t2t+481oktHjF5up1nk1dS4eEMb3A=";
+      hash = "sha256-CnRTSnwhSj6cjrATUuVerGrqt7XxJZYgC5XjUC4+Xrs=";
     };
 
     buildInputs = [ buildbot-pkg ];

pkgs/development/tools/continuous-integration/buildbot/update.sh

···
 
 nix-update buildbot
 nix-update --version=skip buildbot-plugins.www
-nix-update --version=skip buildbot-plugins.www-react
 nix-update --version=skip buildbot-plugins.console-view
-nix-update --version=skip buildbot-plugins.react-console-view
 nix-update --version=skip buildbot-plugins.waterfall-view
-nix-update --version=skip buildbot-plugins.react-waterfall-view
 nix-update --version=skip buildbot-plugins.grid-view
-nix-update --version=skip buildbot-plugins.react-grid-view
 nix-update --version=skip buildbot-plugins.wsgi-dashboards
-nix-update --version=skip buildbot-plugins.react-wsgi-dashboards
 nix-update --version=skip buildbot-plugins.badges

pkgs/development/tools/continuous-integration/buildbot/worker.nix

···
 
 # propagates
 , autobahn
-, future
 , msgpack
 , twisted
 
···
 
   postPatch = ''
     cd worker
+    touch buildbot_worker/py.typed
     substituteInPlace buildbot_worker/scripts/logwatcher.py \
       --replace /usr/bin/tail "${coreutils}/bin/tail"
   '';
···
 
   propagatedBuildInputs = [
     autobahn
-    future
     msgpack
     twisted
   ];