scons: updated to version 0.95.5 and added selectVersion dispatcher

Scons is not only a tool, it's also a python library. However, the
modules are installed in ~/.nix-profile/lib/scons-${version} -- not in
python's "site-packages" directory -- so python won't find the library
without further help. Maybe there should be a symlink in nix-profile? I
guess there should, but I didn't know how to write that into the
expression.

svn path=/nixpkgs/trunk/; revision=12157

4 files changed, 39 insertions, 17 deletions

diff --git a/pkgs/development/tools/build-managers/scons/0.96.1.nix b/pkgs/development/tools/build-managers/scons/0.96.1.nix
new file mode 100644
index 000000000000..4b791dc27734
--- /dev/null
+++ b/pkgs/development/tools/build-managers/scons/0.96.1.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl, python, version ? "0.96.1"}:
+
+assert version == "0.96.1";
+
+import ./default.nix
+{
+  inherit stdenv fetchurl python version;
+  versionHash = "0z8cimrb10pj10zx9hv8xdqa1dpwjj61yhf3l26ifw323in1isk7";
+}
diff --git a/pkgs/development/tools/build-managers/scons/0.98.5.nix b/pkgs/development/tools/build-managers/scons/0.98.5.nix
new file mode 100644
index 000000000000..5320853380e3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/scons/0.98.5.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl, python, version ? "0.98.5"}:
+
+assert version == "0.98.5";
+
+import ./default.nix
+{
+  inherit stdenv fetchurl python version;
+  versionHash = "0xya9pkrwkdg1z2671slhl5nr5jf0pq46cr9ak7dxc8b0wazsh6j";
+}
diff --git a/pkgs/development/tools/build-managers/scons/builder.sh b/pkgs/development/tools/build-managers/scons/builder.sh
deleted file mode 100644
index c5c1a97e4599..000000000000
--- a/pkgs/development/tools/build-managers/scons/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-buildPhase() {
-    true
-}
-
-installPhase() {
-    python setup.py install --prefix=$out
-}
-
-genericBuild
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 168e3287a0d3..421df1a746a7 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -1,11 +1,26 @@
-{stdenv, fetchurl, python}:
+{stdenv, fetchurl, python, version, versionHash}:
 
 stdenv.mkDerivation {
-  name = "scons-0.96.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://sourceforge/scons/scons-0.96.1.tar.gz;
-    md5 = "45b1c346edd8a0970210aeb1e82557c9";
+  name = "scons-${version}";
+  meta =
+  {
+    homepage = "http://scons.org/";
+    description = "An improved, cross-platform substitute for Make";
+    longDescription =
+    '' SCons is an Open Source software construction tool. Think of
+       SCons as an improved, cross-platform substitute for the classic
+       Make utility with integrated functionality similar to
+       autoconf/automake and compiler caches such as ccache. In short,
+       SCons is an easier, more reliable and faster way to build
+       software.
+    '';
   };
+  src = fetchurl
+  {
+    url = "mirror://sourceforge/scons/scons-${version}.tar.gz";
+    sha256 = "${versionHash}";
+  };
+  buildPhase = "true";
+  installPhase = "python setup.py install --prefix=$out";
   buildInputs = [python];
 }