diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-11 14:23:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 14:23:53 +0100 |
| commit | e297ae192a3ae8e34f30b69512980db52008ec91 (patch) | |
| tree | 5bb85c136599deb9b51778f999db7977514e5331 | |
| parent | 1011c765983050a60da3e6fb7738022bb8829016 (diff) | |
| parent | cf497c60f0278a2917b91672e7bbeb37e774503d (diff) | |
Merge pull request #29235 from Twey/buildbot-0.9.11
buildbot: 0.9.9post2 -> 0.9.11
| -rw-r--r-- | pkgs/development/tools/build-managers/buildbot/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/buildbot/worker.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 2ed436981e003..a2d77f0321a3b 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -3,6 +3,7 @@ let withPlugins = plugins: runCommand "wrapped-${package.name}" { buildInputs = [ makeWrapper ] ++ plugins; + propagatedBuildInputs = package.propagatedBuildInputs; passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); } '' makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ @@ -10,14 +11,14 @@ let ln -sfv ${package}/lib $out/lib ''; - package = pythonPackages.buildPythonApplication (rec { + package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.9.post2"; + version = "0.9.11"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w"; + sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv"; }; buildInputs = with pythonPackages; [ @@ -39,7 +40,6 @@ let ]; propagatedBuildInputs = with pythonPackages; [ - # core twisted jinja2 @@ -87,5 +87,5 @@ let maintainers = with maintainers; [ nand0p ryansydnor ]; license = licenses.gpl2; }; - }); + }; in package diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index f87e8db85554f..4fe728b9ce64c 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.9.post2"; + version = "0.9.11"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0"; + sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; |