From ed554d5ae21b7769d64835d02cdad9f8185dcd0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Jun 2015 13:15:03 +0200
Subject: [PATCH] Delete redundant expression cheetahTemplate

Use the one provided by python-packages instead; retain the
top-level cheetahTemplate name as an alias.
---
 pkgs/tools/text/cheetah-template/2.0.1.nix | 18 ------------------
 pkgs/top-level/all-packages.nix            |  5 +----
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/text/cheetah-template/2.0.1.nix

diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix
deleted file mode 100644
index 0bfa72ca00d..00000000000
--- a/pkgs/tools/text/cheetah-template/2.0.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz;
-    sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh";
-  };
-
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
-      
-  name = "cheetah-template-2.0.1";
-  meta = {
-    description = "Templating engine";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..e8382d21446 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1022,10 +1022,6 @@ let
 
   checkinstall = callPackage ../tools/package-management/checkinstall { };
 
-  cheetahTemplate = builderDefsPackage (import ../tools/text/cheetah-template/2.0.1.nix) {
-    inherit makeWrapper python;
-  };
-
   chkrootkit = callPackage ../tools/security/chkrootkit { };
 
   chocolateDoom = callPackage ../games/chocolate-doom { };
@@ -14802,6 +14798,7 @@ let
   haskell-ng = haskell;                 # 2015-04-19
   haskellngPackages = haskellPackages;  # 2015-04-19
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
+  cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
 
   opentsdb = callPackage ../tools/misc/opentsdb {};