alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

buildbot: make buildbot-pkg a real package, and add it as a build input of buildbot

Browse source
This commit is contained in:
Ben Wolsieffer 2018-01-26 18:54:43 -05:00
parent d2e83e6357
commit 7c609d76b1
4 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/tools/build-managers/buildbot/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, openssh, buildbot-worker, pythonPackages, runCommand, makeWrapper }:
{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
let
withPlugins = plugins: runCommand "wrapped-${package.name}" {
@ -36,6 +36,7 @@ let
pyflakes
openssh
buildbot-worker
buildbot-pkg
treq
];

21
pkgs/development/tools/build-managers/buildbot/pkg.nix Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi, setuptools }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-pkg";
version = "0.9.15.post1";
src = fetchPypi {
inherit pname version;
sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh";
};
propagatedBuildInputs = [ setuptools ];
meta = with stdenv.lib; {
homepage = http://buildbot.net/;
description = "Buildbot Packaging Helper";
maintainers = with maintainers; [ nand0p ryansydnor ];
license = licenses.gpl2;
};
}

25
pkgs/development/tools/build-managers/buildbot/plugins.nix
View file

@ -1,27 +1,6 @@
{ stdenv, pythonPackages }:
{ stdenv, pythonPackages, buildbot-pkg }:
let
buildbot-pkg = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-pkg";
version = "0.9.15.post1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh";
};
propagatedBuildInputs = with pythonPackages; [ setuptools ];
meta = with stdenv.lib; {
homepage = http://buildbot.net/;
description = "Buildbot Packaging Helper";
maintainers = with maintainers; [ nand0p ryansydnor ];
license = licenses.gpl2;
};
};
in {
{
www = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot_www";

3
pkgs/top-level/all-packages.nix
View file

@ -7267,6 +7267,9 @@ with pkgs;
buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix {
pythonPackages = python2Packages;
};
buildbot-pkg = callPackage ../development/tools/build-managers/buildbot/pkg.nix {
inherit (python2Packages) buildPythonPackage fetchPypi setuptools;
};
buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix {
pythonPackages = python2Packages;
};