diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
commit | 9183f21f7e005b9229b615e65fa463733267ce96 (patch) | |
tree | 9155247a14d60982c3f4be514e386a976f7240d3 /pkgs/development/tools/build-managers | |
parent | c161cd1773e6411054047b1dd2a9544b0b05b0d1 (diff) | |
parent | c63858a16919de0f929d8377ce616e93a99f2074 (diff) |
Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/apache-ant/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/buildbot/default.nix | 83 |
2 files changed, 67 insertions, 20 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 50f73a42af5fa..47a916f48e2bd 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -11,8 +11,8 @@ let { inherit antContrib jdk; src = fetchurl { - url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.7.1-bin.tar.bz2 ; - sha256 = "15rgkini0g100jygp7z9hgc3yfb9m62q4nk989rin7dqj2flrr94"; + url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.8.0RC1-bin.tar.bz2 ; + sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx"; }; }; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index a8c78b51540dc..92b63869f33be 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,21 +1,68 @@ -{stdenv, fetchurl, python, twisted, makeWrapper}: +{ fetchurl, stdenv, buildPythonPackage, twisted, texinfo }: + +buildPythonPackage (rec { + name = "buildbot-0.7.11p3"; + namePrefix = ""; -stdenv.mkDerivation rec { - name = "buildbot-${version}"; - version = "0.7.8"; - meta = { - homepage = "http://buildbot.net/"; - description = "A system to automate the compile/test cycle to validate code changes."; - }; src = fetchurl { - url = "mirror://sourceforge/buildbot/buildbot-${version}.tar.gz"; - sha256 = "0f3qkbs1y4a1djxbfkvsr1639qkc7bzzsz2wpas2mk1zg8zrci2v"; + url = "mirror://sourceforge/buildbot/${name}.tar.gz"; + sha256 = "0h77ijf5iqvc8bnfxpsh3hvpr7wj23pkcywd3hcyphv1wwlhmhjv"; + }; + + patchPhase = + # The code insists on /usr/bin/tail, /usr/bin/make, etc. + '' echo "patching erroneous absolute path references..." + for i in $(find -name \*.py) + do + sed -i "$i" \ + -e "s|/usr/bin/python|$(type -P python)|g ; s|/usr/bin/||g" + done + ''; + + buildInputs = [ texinfo ]; + propagatedBuildInputs = [ twisted ]; + + # FIXME: Some tests fail. + doCheck = false; + + postInstall = + '' ensureDir "$out/share/info" + make -C docs buildbot.info + cp -v "docs/buildbot.info"* "$out/share/info" + ''; + + meta = { + homepage = http://buildbot.net/; + + license = "GPLv2+"; + + # Of course, we don't really need that on NixOS. :-) + description = "BuildBot, a system to automate the software compile/test cycle"; + + longDescription = + '' The BuildBot is a system to automate the compile/test cycle + required by most software projects to validate code changes. By + automatically rebuilding and testing the tree each time something + has changed, build problems are pinpointed quickly, before other + developers are inconvenienced by the failure. The guilty + developer can be identified and harassed without human + intervention. By running the builds on a variety of platforms, + developers who do not have the facilities to test their changes + everywhere before checkin will at least know shortly afterwards + whether they have broken the build or not. Warning counts, lint + checks, image size, compile time, and other build parameters can + be tracked over time, are more visible, and are therefore easier + to improve. + + The overall goal is to reduce tree breakage and provide a platform + to run tests or code-quality checks that are too annoying or + pedantic for any human to waste their time with. Developers get + immediate (and potentially public) feedback about their changes, + encouraging them to be more careful about testing before checking + in code. + ''; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; - propagatedBuildInputs = [python twisted makeWrapper]; - buildPhase = "true"; - installPhase = - '' - python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1 - for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"; done - ''; -} +}) |