buildbot: 0.9.5 -> 0.9.6

+23 -2
+12 -2
pkgs/development/tools/build-managers/buildbot/default.nix
··· 13 13 package = pythonPackages.buildPythonApplication (rec { 14 14 name = "${pname}-${version}"; 15 15 pname = "buildbot"; 16 - version = "0.9.5"; 16 + version = "0.9.6"; 17 17 18 18 src = pythonPackages.fetchPypi { 19 19 inherit pname version; 20 - sha256 = "11r553nmh87a9pm58wycimapk2pw9hnlc7hffn97xwbqprd8qh66"; 20 + sha256 = "0d6ys1wjwsv4jg4bja1cqhy279hhrl1c9kwyx126srf45slcvg1w"; 21 21 }; 22 22 23 23 buildInputs = with pythonPackages; [ ··· 69 69 70 70 ]; 71 71 72 + patches = [ 73 + # This patch disables the test that tries to reat /etc/os-release which 74 + # is not accessible in sandboxed builds. 75 + ./skip_test_linux_distro.patch 76 + ]; 77 + 72 78 postPatch = '' 73 79 substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" 74 80 ··· 79 85 rm -fv buildbot/test/unit/test_interpolate_secrets.py 80 86 rm -fv buildbot/test/unit/test_secret_in_file.py 81 87 rm -fv buildbot/test/unit/test_secret_in_vault.py 88 + 89 + # Remove this line after next update. See 90 + # https://github.com/buildbot/buildbot/commit/e7fc8c8eba903c2aa6d7e6393499e5b9bffc2334 91 + rm -fv buildbot/test/unit/test_mq_wamp.py 82 92 ''; 83 93 84 94 passthru = { inherit withPlugins; };
+11
pkgs/development/tools/build-managers/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 + 7 + def test_linux_distro(self): 8 + + raise SkipTest("NixOS sandboxed builds hides /etc/os-release") 9 + system = platform.system() 10 + if system != "Linux": 11 + raise SkipTest("test is only for linux")