Unverified Commit 1720332f authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

buildbot: 4.1.0 -> 4.2.0 (#364052)

parents be325b3a edb59b6d

pkgs/development/tools/continuous-integration/buildbot/allow_git_urls_to_be_renderable_again.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/master/buildbot/util/git.py b/master/buildbot/util/git.py

index 0ed9ac3037f..49ef359537c 100644

--- a/master/buildbot/util/git.py

+++ b/master/buildbot/util/git.py

@@ -67,8 +67,8 @@ def getSshCommand(keyPath, knownHostsPath):

 

 

 def scp_style_to_url_syntax(address, port=22, scheme='ssh'):

-    if any(['://' in address, ':\\' in address, ':' not in address]):

-        # the address already has a URL syntax or is a local path

+    if not isinstance(address, str) or any(['://' in address, ':\\' in address, ':' not in address]):

+        # the address already has a URL syntax or is a local path or is a renderable

         return address

     host, path = address.split(':')

     return f'{scheme}://{host}:{port}/{path}'

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

+5 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ let 
in

buildPythonApplication rec {

  pname = "buildbot";

  version = "4.1.0";

  version = "4.2.0";

  format = "pyproject";



  disabled = pythonOlder "3.8";
@@ -86,7 +86,7 @@ buildPythonApplication rec { 
    owner = "buildbot";

    repo = "buildbot";

    rev = "v${version}";

    hash = "sha256-RPg4eXqpm/F1SSoB4MVo61DgZv/iE2R4VtCkUU69iA8=";

    hash = "sha256-eraNF2J5x04qQESkned/2Io9gb2ZL9XzUfWHwSGErNY=";

  };



  build-system = [
@@ -149,6 +149,9 @@ buildPythonApplication rec { 
    # This patch disables the test that tries to read /etc/os-release which

    # is not accessible in sandboxed builds.

    ./skip_test_linux_distro.patch



    # https://github.com/buildbot/buildbot/issues/8274

    ./allow_git_urls_to_be_renderable_again.patch

  ];



  postPatch = ''

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

+6 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


    src = fetchurl {

      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";

      hash = "sha256-+ZiOkTZLdwqsZfApW6aQxoNkbcFCaB4BHEjMTZIl+Rg=";

      hash = "sha256-pd6ZzrFHKB/acffuM7TxUtXRsZTMIyoUWVqIiilJH/s=";

    };



    # Remove unnecessary circular dependency on buildbot
@@ -48,7 +48,7 @@ 


    src = fetchurl {

      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";

      hash = "sha256-IgG/afjU//zrcHuTXMBLlz1gCmB31fWaECIm+UqaMgA=";

      hash = "sha256-XfELWX6d4Lat5ByNcsdw9qJd7FjUGL8GRqJkWHKjoTI=";

    };



    buildInputs = [ buildbot-pkg ];
@@ -70,7 +70,7 @@ 


    src = fetchurl {

      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";

      hash = "sha256-E0yFY3PtTZ8XtJGDMh0aRljhTNsWHqHQzcBORTgrCIA=";

      hash = "sha256-1osf0WefIjogFk3BqRsX/pjVIzvd18W/NG8LyuFMI/U=";

    };



    buildInputs = [ buildbot-pkg ];
@@ -92,7 +92,7 @@ 


    src = fetchurl {

      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";

      hash = "sha256-KR4M7RSULCM1aS7vYjWuMXIHGpO+xFjfhC8+YncAmlE=";

      hash = "sha256-3BqQTTj6WPbmHr6bzR4PcVnl8WcTKokY1YHLuwHYqLw=";

    };



    buildInputs = [ buildbot-pkg ];
@@ -114,7 +114,7 @@ 


    src = fetchurl {

      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";

      hash = "sha256-L7DayDddqrwOyBwgy4w1waCL+49GMtdrCdZNpcLrFXk=";

      hash = "sha256-tZBsyaBhewXs0PWxJMtPJ3yv8Z3dS1wESmJI0beMG28=";

    };



    buildInputs = [ buildbot-pkg ];
@@ -136,7 +136,7 @@ 


    src = fetchurl {

      url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz";

      hash = "sha256-CnRTSnwhSj6cjrATUuVerGrqt7XxJZYgC5XjUC4+Xrs=";

      hash = "sha256-oQ+exQ4eiF+y9JiYPXbJf9azJVgFZgbBby4MRcBLZgQ=";

    };



    buildInputs = [ buildbot-pkg ];