From c00b1ba8f3525a63f5015cab9c6acb71dfef4b7a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 28 Dec 2013 00:52:23 -0600
Subject: [PATCH] Update matplotlib from 1.2.1 -> 1.3.1

Additionally, fix the build and install phases so that they build under
python3
---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b645ed921b7..4d7f1732eab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3452,25 +3452,30 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     else pkgs.stdenv;
 
   matplotlib = matplotlibStdenv.mkDerivation (rec {
-    name = "matplotlib-1.2.1";
+    name = "matplotlib-1.3.1";
 
     src = fetchurl {
-      url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz";
-      sha256 = "16x2ksdxx5p92v98qngh29hdz1bnqy77fhggbjq30pyqmrr8kqaj";
+      url = "mirror://sourceforge/matplotlib/${name}.tar.gz";
+      sha256 = "0smgpn7lwbn02nbyhawyn0n6r3pb65zk501f21bjgavnjjfnf5pa";
     };
 
     # error: invalid command 'test'
     doCheck = false;
 
-    buildInputs = [ python pkgs.which pkgs.ghostscript ];
+    buildInputs = [ python pkgs.which pkgs.ghostscript distribute ];
 
     propagatedBuildInputs =
-      [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl
+      [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl
         pkgs.tk pkgs.xlibs.libX11 ];
+    
+    buildPhase = "${python}/bin/${python.executable} setup.py build";
 
-    buildPhase = "python setup.py build";
-
-    installPhase = "python setup.py install --prefix=$out";
+    # The sed expression parses out the python version from an executable with appended characters
+    installPhase = ''
+      SITE="$out/lib/${python.libPrefix}/site-packages"
+      mkdir -p "$SITE"
+      PYTHONPATH="$PYTHONPATH:$SITE" ${python}/bin/${python.executable} setup.py install --prefix=$out
+    '';
 
     meta = with stdenv.lib; {
       description = "python plotting library, making publication quality plots";