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: 62b2bf3f8e8c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 645522a97177
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Mar 8, 2020

  1. buildbot: 2.6.0 -> 2.7.0 

    (cherry picked from commit 0a545f6)

cc #81283
    @r-ryantm @veprbl
    r-ryantm authored and veprbl committed Mar 8, 2020
    Copy the full SHA
    55cbe7d View commit details

  2. buildbot: 2.6.0 -> 2.7.0 (#81406) 

    (cherry picked from commit 07727db)

cc #81406
    @lopsided98 @veprbl
    lopsided98 authored and veprbl committed Mar 8, 2020
    Copy the full SHA
    645522a View commit details
2 changes: 1 addition & 1 deletion nixos/tests/buildbot.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ import ./make-test-python.nix {
systemd.services.git-daemon = {
description = "Git daemon for the test";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
after = [ "network.target" "sshd.service" ];

serviceConfig.Restart = "always";
path = with pkgs; [ coreutils git openssh ];
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/buildbot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
parameterized, git, openssh, glibcLocales }:
parameterized, git, openssh, glibcLocales, nixosTests }:

let
withPlugins = plugins: buildPythonPackage {
@@ -25,11 +25,11 @@ let

package = buildPythonPackage rec {
pname = "buildbot";
version = "2.6.0";
version = "2.7.0";

src = fetchPypi {
inherit pname version;
sha256 = "1l3ajhy68jddbgbizaa5hq65lgqkll6389hss4p2j36cbxbn7hiv";
sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406";
};

propagatedBuildInputs = [
@@ -91,6 +91,7 @@ let

passthru = {
inherit withPlugins;
tests.buildbot = nixosTests.buildbot;
};

meta = with lib; {
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildbot/pkg.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "buildbot-pkg";
version = "2.6.0";
version = "2.7.0";

src = fetchPypi {
inherit pname version;
sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z";
sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb";
};

postPatch = ''
14 changes: 6 additions & 8 deletions pkgs/development/python-modules/buildbot/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,12 @@

src = fetchPypi {
inherit pname version;
sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg";
sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi";
};

# Remove unneccessary circular dependency on buildbot
postPatch = ''
sed -i setup.py \
-e "/import buildbot/d" \
-e "s/'buildbot',//"
sed -i "s/'buildbot'//" setup.py
'';

buildInputs = [ buildbot-pkg mock ];
@@ -36,7 +34,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10";
sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8";
};

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

src = fetchPypi {
inherit pname version;
sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb";
sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58";
};

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

src = fetchPypi {
inherit pname version;
sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh";
sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4";
};

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

src = fetchPypi {
inherit pname version;
sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r";
sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg";
};

buildInputs = [ buildbot-pkg ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildbot/worker.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

buildPythonPackage (rec {
pname = "buildbot-worker";
version = "2.6.0";
version = "2.7.0";

src = fetchPypi {
inherit pname version;
sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l";
sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6";
};

propagatedBuildInputs = [ twisted future ];