From 85546a8e316788bda4240cfa517941d785bca014 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Sep 2008 15:11:09 +0000
Subject: 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
---
 pkgs/top-level/all-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'pkgs/top-level/all-packages.nix')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d1fb4d9cc5..d14f391cec2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {
-- 
cgit 1.4.1