commit eb77fcd0b10e7ceae69f6eb7d278a9eb5c195d08 · pyrox.dev/nixpkgs

+18 -5

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

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , buildPythonApplication

     

       4
       -
       , fetchPypi

     

       0
        
       
     

       5
        
       , makeWrapper

     

       6
        
       # Tie withPlugins through the fixed point here, so it will receive an

     

       7
        
       # overridden version properly

     
···

       77
        
       

     

       78
        
         disabled = pythonOlder "3.8";

     

       79
        
       

     

       80
       -
         src = fetchPypi {

     

       81
       -
           inherit pname version;

     

       82
       -
           hash = "sha256-qcICSsjcgOrLG8zHBx0eSVSiXDAeHPH4roRZI9TZTkk=";

     

       0
        
       
     

       0
        
       
     

       83
        
         };

     

       84
        
       

     

       85
        
         build-system = [

     
···

       134
        
           # This patch disables the test that tries to read /etc/os-release which

     

       135
        
           # is not accessible in sandboxed builds.

     

       136
        
           ./skip_test_linux_distro.patch

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       137
        
         ];

     

       138
        
       

     

       139
        
         postPatch = ''

     

       140
       -
           substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       141
        
         '';

     

       142
        
       

     

       143
        
         # Silence the depreciation warning from SqlAlchemy

···

       1
        
       { lib

     

       2
        
       , stdenv

     

       3
        
       , buildPythonApplication

     

       4
       +
       , fetchFromGitHub

     

       5
       +
       , fetchpatch

     

       6
        
       , makeWrapper

     

       7
        
       # Tie withPlugins through the fixed point here, so it will receive an

     

       8
        
       # overridden version properly

     
···

       78
        
       

     

       79
        
         disabled = pythonOlder "3.8";

     

       80
        
       

     

       81
       +
         src = fetchFromGitHub {

     

       82
       +
           owner = "buildbot";

     

       83
       +
           repo = "buildbot";

     

       84
       +
           rev = "v${version}";

     

       85
       +
           hash = "sha256-rDbAWLoEEjygW72YDBsVwiaHdRTVYA9IFxY3XMDleho=";

     

       86
        
         };

     

       87
        
       

     

       88
        
         build-system = [

     
···

       137
        
           # This patch disables the test that tries to read /etc/os-release which

     

       138
        
           # is not accessible in sandboxed builds.

     

       139
        
           ./skip_test_linux_distro.patch

     

       140
       +
           # Fix gitpoller, source: https://github.com/buildbot/buildbot/pull/7664

     

       141
       +
           # Included in next release.

     

       142
       +
           (fetchpatch {

     

       143
       +
             url = "https://github.com/buildbot/buildbot/commit/dd5d61e63e3b0740cc538a225ccf104ccecfc734.patch";

     

       144
       +
             sha256 = "sha256-CL6uRaKxh8uCBfWQ0tNiLh2Ym0HVatWni8hcuTyAAw0=";

     

       145
       +
             excludes = ["master/buildbot/test/unit/changes/test_gitpoller.py"];

     

       146
       +
           })

     

       147
        
         ];

     

       148
        
       

     

       149
        
         postPatch = ''

     

       150
       +
           substituteInPlace master/buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"

     

       151
       +
         '';

     

       152
       +
         preBuild = ''

     

       153
       +
           cd master

     

       154
        
         '';

     

       155
        
       

     

       156
        
         # Silence the depreciation warning from SqlAlchemy

+3 -3

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

···

       1
       -
       diff -Nur buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py

     

       2
       -
       --- buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py	2017-04-19 16:57:02.000000000 +0200

     

       3
       -
       +++ buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py	2017-05-04 12:22:54.575762551 +0200

     

       4
        
       @@ -147,6 +147,7 @@

     

       5
        
                _sendBuildbotNetUsageData({'foo': 'bar'})

     

       6

···

       1
       +
       diff -Nur buildbot-0.9.6/master/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py

     

       2
       +
       --- buildbot-0.9.6/master/buildbot/test/unit/test_buildbot_net_usage_data.py	2017-04-19 16:57:02.000000000 +0200

     

       3
       +
       +++ buildbot-0.9.6.patched/master/buildbot/test/unit/test_buildbot_net_usage_data.py	2017-05-04 12:22:54.575762551 +0200

     

       4
        
       @@ -147,6 +147,7 @@

     

       5
        
                _sendBuildbotNetUsageData({'foo': 'bar'})

     

       6