Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34de62409f6e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a9238eae8f0d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on May 12, 2017

  1. buildbot: 0.9.6 -> 0.9.7

    Fernando J Pando committed May 12, 2017
    Copy the full SHA
    a6bcf14 View commit details

Commits on May 14, 2017

  1. Merge pull request #25738 from nand0p/buildbot-0.9.7 

    buildbot: 0.9.6 -> 0.9.7
    @FRidh
    FRidh authored May 14, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9238ea View commit details
18 changes: 3 additions & 15 deletions pkgs/development/tools/build-managers/buildbot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ let
package = pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot";
version = "0.9.6";
version = "0.9.7";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0d6ys1wjwsv4jg4bja1cqhy279hhrl1c9kwyx126srf45slcvg1w";
sha256 = "0cwy39ap2v9kni3zm92633cnqf7qsnb4zlargx060pbfagkg1jwg";
};

buildInputs = with pythonPackages; [
@@ -70,25 +70,13 @@ let
];

patches = [
# This patch disables the test that tries to reat /etc/os-release which
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
];

postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
# NOTE: secrets management tests currently broken
rm -fv buildbot/test/integration/test_integration_secrets.py
rm -fv buildbot/test/integration/test_integration_secrets_with_vault.py
rm -fv buildbot/test/unit/test_fake_secrets_manager.py
rm -fv buildbot/test/unit/test_interpolate_secrets.py
rm -fv buildbot/test/unit/test_secret_in_file.py
rm -fv buildbot/test/unit/test_secret_in_vault.py
# Remove this line after next update. See
# https://github.com/buildbot/buildbot/commit/e7fc8c8eba903c2aa6d7e6393499e5b9bffc2334
rm -fv buildbot/test/unit/test_mq_wamp.py
'';

passthru = { inherit withPlugins; };
16 changes: 8 additions & 8 deletions pkgs/development/tools/build-managers/buildbot/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ let
buildbot-pkg = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-pkg";
version = "0.9.5";
version = "0.9.7";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1xpi4w0lc6z97pmmms85dvdspacbzlvs8zi3kv1r4rypk3znwmi1";
sha256 = "0p351r10y42gwgxb2qg7xlsbhmnzdmqp6h4922l0yfii3pzmrdzv";
};

propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -25,14 +25,14 @@ in {
www = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot_www";
version = "0.9.5";
version = "0.9.7";

# NOTE: wheel is used due to buildbot circular dependency
format = "wheel";

src = pythonPackages.fetchPypi {
inherit pname version format;
sha256 = "1d7yjxka6slflm3wbdpq4sr1kagmgbqdv2zgx9bq77jvjh7ga0py";
sha256 = "1wf2spnilm0dkyw95vf57lca453sbly4r6ak3lxa8bpwhxb6lkdn";
};

meta = with stdenv.lib; {
@@ -46,11 +46,11 @@ in {
console-view = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-console-view";
version = "0.9.5";
version = "0.9.7";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1s6mvw955dsgk7hvb1xa32bbd7w2yma62py5s0vmi5shv8nwq3hb";
sha256 = "1iv77886rbbn0wlzl5qiqc08rgbymxirqh3vmimqwsabbh7fhzkm";
};

propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -66,11 +66,11 @@ in {
waterfall-view = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-waterfall-view";
version = "0.9.5";
version = "0.9.7";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "116846d987wp1bz78f0h4lypqcns5073vzhb4vsqbf08sppgr67k";
sha256 = "1q42l25cryx0yp6lbbl0mxnxkb9h24wawhzhi1wkc3kj8zs5sifn";
};

propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/buildbot/worker.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot-worker";
version = "0.9.5";
version = "0.9.7";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1al7jam351sf781axj4kfhj70cc0g21zv81ynk410kdccjyxp2dy";
sha256 = "0s62i808l13a8dprmrb2dikh7d1xvvdnw3pfhl6im0i9fc64w6x4";
};

buildInputs = with pythonPackages; [ setuptoolsTrial mock ];