diff options
author | Peter Simons <simons@cryp.to> | 2008-09-01 15:11:09 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2008-09-01 15:11:09 +0000 |
commit | 85546a8e316788bda4240cfa517941d785bca014 (patch) | |
tree | b4f5a1e9cf1577c4cfda22b182be5ab2decd35f6 /pkgs/top-level/all-packages.nix | |
parent | 687d66d2b93314403bbe5afdfaad2b3e61cd5746 (diff) | |
download | nixpkgs-85546a8e316788bda4240cfa517941d785bca014.tar nixpkgs-85546a8e316788bda4240cfa517941d785bca014.tar.gz nixpkgs-85546a8e316788bda4240cfa517941d785bca014.tar.bz2 nixpkgs-85546a8e316788bda4240cfa517941d785bca014.tar.lz nixpkgs-85546a8e316788bda4240cfa517941d785bca014.tar.xz nixpkgs-85546a8e316788bda4240cfa517941d785bca014.tar.zst nixpkgs-85546a8e316788bda4240cfa517941d785bca014.zip |
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
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 6 insertions, 2 deletions
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 { |