Updated scons and twisted; added buildbot.
* Updated scons to version 1.0.0. Also added appropriate makeWrapper calls to ensure that the python binary finds its library files. * Updated Twisted from 2.5 to 8.1. * Added an expression for buildbot. svn path=/nixpkgs/trunk/; revision=12782
This commit is contained in:
parent
687d66d2b9
commit
85546a8e31
@ -1,10 +1,10 @@
|
||||
{stdenv, fetchurl, python, ZopeInterface}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "twisted-2.5.0";
|
||||
name = "twisted-8.1.0";
|
||||
src = fetchurl {
|
||||
url = http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-2.5.0.tar.bz2;
|
||||
sha256 = "1kfj4354lm4kphm317giyldykyd17lba2xd7y512lxc38hzxzcpk";
|
||||
url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
|
||||
sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
|
||||
};
|
||||
buildInputs = [python];
|
||||
propagatedBuildInputs = [ZopeInterface];
|
||||
|
21
pkgs/development/tools/build-managers/buildbot/default.nix
Normal file
21
pkgs/development/tools/build-managers/buildbot/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{stdenv, fetchurl, python, twisted, makeWrapper}:
|
||||
|
||||
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";
|
||||
};
|
||||
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
|
||||
'';
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
{stdenv, fetchurl, python, version ? "0.96.1"}:
|
||||
|
||||
assert version == "0.96.1";
|
||||
|
||||
import ./default.nix
|
||||
{
|
||||
inherit stdenv fetchurl python version;
|
||||
versionHash = "0z8cimrb10pj10zx9hv8xdqa1dpwjj61yhf3l26ifw323in1isk7";
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
{stdenv, fetchurl, python, version ? "0.98.5"}:
|
||||
|
||||
assert version == "0.98.5";
|
||||
|
||||
import ./default.nix
|
||||
{
|
||||
inherit stdenv fetchurl python version;
|
||||
versionHash = "0xya9pkrwkdg1z2671slhl5nr5jf0pq46cr9ak7dxc8b0wazsh6j";
|
||||
}
|
@ -1,7 +1,8 @@
|
||||
{stdenv, fetchurl, python, version, versionHash}:
|
||||
{stdenv, fetchurl, python, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scons-${version}";
|
||||
version = "1.0.0";
|
||||
meta = {
|
||||
homepage = "http://scons.org/";
|
||||
description = "An improved, cross-platform substitute for Make";
|
||||
@ -16,9 +17,13 @@ stdenv.mkDerivation {
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/scons/scons-${version}.tar.gz";
|
||||
sha256 = "${versionHash}";
|
||||
sha256 = "13nyy7n0iddr91r136fj15brni8r5f3j6cx57w5aqfvmnb0lv51x";
|
||||
};
|
||||
propagatedBuildInputs = [python];
|
||||
propagatedBuildInputs = [python makeWrapper];
|
||||
buildPhase = "true";
|
||||
installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) --hardlink-scons -O1";
|
||||
installPhase =
|
||||
''
|
||||
python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) --hardlink-scons -O1
|
||||
for n in $out/bin/*; do wrapProgram $n --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH:\$PYTHONPATH"; done
|
||||
'';
|
||||
}
|
||||
|
@ -2171,6 +2171,10 @@ let
|
||||
inherit fetchurl stdenv m4;
|
||||
};
|
||||
|
||||
buildbot = import ../development/tools/build-managers/buildbot {
|
||||
inherit fetchurl stdenv python twisted makeWrapper;
|
||||
};
|
||||
|
||||
byacc = import ../development/tools/parsing/byacc {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
@ -2386,8 +2390,8 @@ let
|
||||
inherit fetchurl stdenv unzip;
|
||||
};
|
||||
|
||||
scons = selectVersion ../development/tools/build-managers/scons "0.98.5" {
|
||||
inherit fetchurl stdenv python;
|
||||
scons = import ../development/tools/build-managers/scons {
|
||||
inherit fetchurl stdenv python makeWrapper;
|
||||
};
|
||||
|
||||
sdf = import ../development/tools/parsing/sdf {
|
||||
|
Loading…
Reference in New Issue
Block a user