MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #19230 from nand0p/buildbot-9rc4

Browse source 
buildbot: 0.9.0rc3 -> 0.9.0rc4
This commit is contained in:
Frederik Rietdijk 2016-10-11 17:00:41 +02:00 committed by GitHub
commit 67005e3c79
3 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,12 @@
{ stdenv
, pythonPackages
, fetchurl
, plugins ? []
}:
{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }:
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot";
version = "0.9.0rc3";
version = "0.9.0rc4";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
sha256 = "18238n9l0pfivb23csy5lnkx91fcm4jgmhxn03f2nfnp00rlppzb";
sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc";
};
buildInputs = with pythonPackages; [
@ -61,16 +57,17 @@ pythonPackages.buildPythonApplication (rec {
preInstall = ''
# writes out a file that can't be read properly
sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py
# re-hardcode path to tail
sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
'';
postFixup = ''
buildPythonPath "$out"
patchPythonScript "$out/bin/buildbot"
mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot
echo "#!/bin/bash" > $out/bin/buildbot
echo "export PYTHONPATH=$out/lib/python2.7/site-packages:$PYTHONPATH" >> $out/bin/buildbot
echo "#!/bin/sh" > $out/bin/buildbot
echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot
echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot
chmod -c 755 $out/bin/buildbot
chmod -c 555 $out/bin/buildbot
'';
meta = with stdenv.lib; {
@ -78,5 +75,6 @@ pythonPackages.buildPythonApplication (rec {
description = "Continuous integration system that automates the build/test cycle";
maintainers = with maintainers; [ nand0p ryansydnor ];
platforms = platforms.all;
license = licenses.gpl2;
};
})

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

@ -1,17 +1,14 @@
{ stdenv
, fetchurl
, pythonPackages
}:
{ stdenv, fetchurl, pythonPackages }:
let
buildbot-pkg = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-pkg";
version = "0.9.0rc3";
version = "0.9.0rc4";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
sha256 = "0a05dgc5nn6sx3nicfvqwar9iy8yxhq92688dhs5p6mzjxaprlxm";
sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10";
};
propagatedBuildInputs = with pythonPackages; [ setuptools ];
@ -21,6 +18,7 @@ let
description = "Buildbot Packaging Helper";
maintainers = with maintainers; [ nand0p ryansydnor ];
platforms = platforms.all;
license = licenses.gpl2;
};
};
@ -29,13 +27,14 @@ in {
www = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot_www";
version = "0.9.0rc3";
version = "0.9.0rc4";
# NOTE: wheel is used due to buildbot circular dependency
format = "wheel";
src = fetchurl {
url = "https://pypi.python.org/packages/93/1e/09e329fc831ae4f5be05eb3363c9028ab7e26e9c7e5d89e3aa66c3f25d9d/${name}-py2-none-any.whl";
sha256 = "0fy2v7y1kc53zm67ddx85yz5qh4b7hmcbfzmsziiv9n83a0qh1i6";
url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl";
sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p";
};
propagatedBuildInputs = [ buildbot-pkg ];
@ -45,17 +44,18 @@ in {
description = "Buildbot UI";
maintainers = with maintainers; [ nand0p ryansydnor ];
platforms = platforms.all;
license = licenses.gpl2;
};
};
console-view = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-console-view";
version = "0.9.0rc3";
version = "0.9.0rc4";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
sha256 = "09yfqrnwfambg1j4x7ywnjg4xfhvv6f242zzh35fwj64cnqmqx07";
sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva";
};
propagatedBuildInputs = [ buildbot-pkg ];
@ -65,17 +65,18 @@ in {
description = "Buildbot Console View Plugin";
maintainers = with maintainers; [ nand0p ryansydnor ];
platforms = platforms.all;
license = licenses.gpl2;
};
};
waterfall-view = pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "buildbot-waterfall-view";
version = "0.9.0rc3";
version = "0.9.0rc4";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
sha256 = "0xpqxj3mmwl5xdhm3p52shl24d85qapdk4v66f9hrb9pnk5k4a81";
sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8";
};
propagatedBuildInputs = [ buildbot-pkg ];
@ -85,6 +86,7 @@ in {
description = "Buildbot Waterfall View Plugin";
maintainers = with maintainers; [ nand0p ryansydnor ];
platforms = platforms.all;
license = licenses.gpl2;
};
};
}

10
pkgs/development/tools/build-managers/buildbot/worker.nix
View file

@ -1,16 +1,13 @@
{ stdenv
, fetchurl
, pythonPackages
}:
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot-worker";
version = "0.9.0rc3";
version = "0.9.0rc4";
src = fetchurl {
url = "mirror://pypi/b/${pname}/${name}.tar.gz";
sha256 = "0wqn2176rk7hc27r4hfy5qnxp0nr9iis5nyzg5x07xljnsspnhy1";
sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c";
};
buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
@ -21,5 +18,6 @@ pythonPackages.buildPythonApplication (rec {
description = "Buildbot Worker Daemon";
maintainers = with maintainers; [ nand0p ryansydnor ];
platforms = platforms.all;
license = licenses.gpl2;
};
})