From cba0649530c1fcbc5e56655e3bdeffeafec1bc7e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Sep 2004 21:12:25 +0000
Subject: [PATCH] * Python updated to 2.3.4.

svn path=/nixpkgs/trunk/; revision=1451
---
 pkgs/development/interpreters/python/builder.sh  | 13 -------------
 pkgs/development/interpreters/python/default.nix | 11 ++++++-----
 2 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/builder.sh

diff --git a/pkgs/development/interpreters/python/builder.sh b/pkgs/development/interpreters/python/builder.sh
deleted file mode 100644
index d7baadecdac8..000000000000
--- a/pkgs/development/interpreters/python/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-buildinputs=""
-if test -n "$zlibSupport"; then
-  buildinputs="$zlib $buildinputs"
-fi
-. $stdenv/setup
-
-tar xvfj $src
-cd Python-*
-./configure --prefix=$out
-
-make
-make install
-
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index e3e075dc0f15..9e6236892b57 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -3,12 +3,13 @@
 assert zlibSupport -> zlib != null;
 
 stdenv.mkDerivation {
-  name = "python-2.3.3";
-  builder = ./builder.sh;
+  name = "python-2.3.4";
   src = fetchurl {
-      url = http://www.python.org/ftp/python/2.3.3/Python-2.3.3.tar.bz2;
-      md5 = "70ada9f65742ab2c77a96bcd6dffd9b1";
+    url = http://www.python.org/ftp/python/2.3.4/Python-2.3.4.tar.bz2;
+    md5 = "a2c089faa2726c142419c03472fc4063";
   };
-  zlib = if zlibSupport then zlib else null;
+  buildInputs = [
+    (if zlibSupport then zlib else null)
+  ];
   inherit zlibSupport;
 }