From 941ee1ba6ede1a3424b1478bcb10b418fdb67604 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Sep 2016 22:36:30 +0200
Subject: [PATCH] pystringtemplate -> pythonPackages.pystringtemplate

and use buildPythonPackage
---
 .../python-modules/stringtemplate/default.nix       | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  2 --
 pkgs/top-level/python-packages.nix                  |  2 ++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index 18b920381943..50a425132a26 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, python, antlr}:
+{stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}:
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   name = "PyStringTemplate-${version}";
   version = "3.2b1";
 
@@ -9,13 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
   };
 
-  propagatedBuildInputs = [python antlr];
+  propagatedBuildInputs = [ antlr ];
 
-  dontBuild = true;
+  disabled = isPy3k;
 
-  installPhase = ''
-    python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
-  '';
+  # No tests included in archive
+  doCheck = false;
 
   meta = {
     homepage = "http://www.stringtemplate.org/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7534840428e..7d9f7219bd57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3274,8 +3274,6 @@ in
 
   pygmentex = callPackage ../tools/typesetting/pygmentex { };
 
-  pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
-
   pythonIRClib = pythonPackages.pythonIRClib;
 
   pythonSexy = callPackage ../development/python-modules/libsexy { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56540965a078..2b9ec2721101 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17969,6 +17969,8 @@ in modules // {
     };
   };
 
+  pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
+
   pillow = buildPythonPackage rec {
     name = "Pillow-3.3.1";