nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33992 from lopsided98/buildbot-update

Browse Source 
buildbot: 0.9.11 -> 0.9.15.post1
This commit is contained in:
Frederik Rietdijk 2018-02-03 09:05:16 +00:00 committed by GitHub
commit 2564ea97c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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}" {
@ -14,11 +14,11 @@ let
package = pythonPackages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "buildbot";
version = "0.9.11";
version = "0.9.15.post1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv";
sha256 = "01m5x4lpz90lqf8j0s2c26gqb5yzan6x9d1ffgmrklwf0bljkwni";
};
buildInputs = with pythonPackages; [
@ -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;
};
}

35
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.11";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1gh7wj9z7n7yfs219jbv9pdd2w8dwj6qpa090ffjkfpgd3xana33";
};
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";
@ -32,7 +11,7 @@ in {
src = pythonPackages.fetchPypi {
inherit pname version format;
sha256 = "0fk1swdncg4nha744mzkf6jqh1zv1cfhnqvd19669kjcyjx9i68d";
sha256 = "19cnzp5prima3jrk525xspw7vqc5pjln2nihj4kc3w90dhzllj8x";
};
meta = with stdenv.lib; {
@ -50,7 +29,7 @@ in {
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "16wxgnh35916c2gw34971ynx319lnm9addhqvii885vid44pqim0";
sha256 = "1j6aw2j2sl7ix8rb67pbs6nfvv8v3smgkvqzsjsyh5sdfr2663cg";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@ -70,7 +49,7 @@ in {
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1hcr8xsc0ajfg2vz2h8g5s8ypsp32kdplgqp21jh8z5y0a6nzqsl";
sha256 = "0k0wd4rq034bij2flfjv60h8czkfn836bnaa7hwsrl58gxds39m4";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@ -90,7 +69,7 @@ in {
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0aw1073xq549q5jkjk31zhqpasp8jiy4gch0fjyw8qy0dax8hc7r";
sha256 = "08ng56jmy50s3zyn6wxizji1zhgzhi65z7w3wljg02qrbd5688gj";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@ -110,7 +89,7 @@ in {
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0x99mdmn1ngcnmkxr40hwqafsq48jybdz45y5kpc0yw68n0bfwmv";
sha256 = "15fm72yymv873n3vsw9kprypcf6jzln18v4lb062n8lqw9pykwb1";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];

4
pkgs/development/tools/build-managers/buildbot/worker.nix
View File

@ -3,11 +3,11 @@
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot-worker";
version = "0.9.11";
version = "0.9.15.post1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22";
sha256 = "12zscqb218w88y9fd1jwfn4cr2sw35j998d0jlgd22bch020sy65";
};
buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

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

@ -7278,6 +7278,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;
};