From 270a0009bee37f95fe8c1d741f0d2b78b6571774 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Mar 2013 01:00:21 +0100
Subject: [PATCH] python3: update to version 3.3.0

---
 .../interpreters/python/{3.2 => 3.3}/default.nix            | 6 +++---
 .../interpreters/python/{3.2 => 3.3}/setup-hook.sh          | 0
 pkgs/top-level/all-packages.nix                             | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/development/interpreters/python/{3.2 => 3.3}/default.nix (94%)
 rename pkgs/development/interpreters/python/{3.2 => 3.3}/setup-hook.sh (100%)

diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
similarity index 94%
rename from pkgs/development/interpreters/python/3.2/default.nix
rename to pkgs/development/interpreters/python/3.3/default.nix
index 64442f2e35b..dc9f99e9cdc 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -16,8 +16,8 @@ assert readline != null -> ncurses != null;
 with stdenv.lib;
 
 let
-  majorVersion = "3.2";
-  version = "${majorVersion}.3";
+  majorVersion = "3.3";
+  version = "${majorVersion}.0";
 
   buildInputs = filter (p: p != null) [
     zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
-    sha256 = "5648ec81f93870fde2f0aa4ed45c8718692b15ce6fd9ed309bfb827ae12010aa";
+    sha256 = "1ybdf7wc8pfw51rf7xcywfw27n6l97qyzd1ibpq151q5dkyi7h8m";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/python/3.2/setup-hook.sh
rename to pkgs/development/interpreters/python/3.3/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 458e2ef4a90..fb851c3d597 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2876,8 +2876,7 @@ let
 
   pure = callPackage ../development/interpreters/pure {};
 
-  python3 = hiPrio python32;
-  python32 = callPackage ../development/interpreters/python/3.2 { };
+  python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
 
   python = python27;
   python26 = callPackage ../development/interpreters/python/2.6 { };
@@ -6647,7 +6646,7 @@ let
   };
 
   blender = callPackage  ../applications/misc/blender {
-    python = python32;
+    python = python3;
   };
 
   bristol = callPackage ../applications/audio/bristol { };