From 901999857676ff1f285d2850c484cee2a506d6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 27 Feb 2014 16:35:37 +0100
Subject: [PATCH] refactor cython into pythonPackages, fixes #1803

---
 .../interpreters/cython/2/default.nix         | 21 -------------------
 .../interpreters/cython/3/default.nix         | 21 -------------------
 pkgs/top-level/all-packages.nix               |  4 ++--
 pkgs/top-level/python-packages.nix            | 18 ++++++++++++++++
 4 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/interpreters/cython/2/default.nix
 delete mode 100644 pkgs/development/interpreters/cython/3/default.nix

diff --git a/pkgs/development/interpreters/cython/2/default.nix b/pkgs/development/interpreters/cython/2/default.nix
deleted file mode 100644
index 5b3cfd588c9f..000000000000
--- a/pkgs/development/interpreters/cython/2/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, python, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "cython-0.20";
-
-  src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.20.tar.gz;
-    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
-  };
-
-  buildPhase = "python setup.py build --build-base $out";
-
-  installPhase = "python setup.py install --prefix=$out";
-
-  buildInputs = [ python pkgconfig ];
-
-  meta = {
-    description = "An interpreter to help writing C extensions for Python 2";
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/interpreters/cython/3/default.nix b/pkgs/development/interpreters/cython/3/default.nix
deleted file mode 100644
index d977ea87b3e1..000000000000
--- a/pkgs/development/interpreters/cython/3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, python3, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "cython3-0.20";
-
-  src = fetchurl {
-    url = http://www.cython.org/release/Cython-0.20.tar.gz;
-    sha256 = "1a3m7zhw8mdyr95fwx7n1scrz82drr433i99dzm1n9dxi0cx2qah";
-  };
-
-  buildPhase = "python3 setup.py build --build-base $out";
-
-  installPhase = "python3 setup.py install --prefix=$out";
-
-  buildInputs = [ python3 pkgconfig ];
-
-  meta = {
-    description = "An interpreter to help writing C extensions for Python3";
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 824d7458505e..2005c4327809 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2360,8 +2360,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  cython = callPackage ../development/interpreters/cython/2 { };
-  cython3 = callPackage ../development/interpreters/cython/3 { };
+  cython = pythonPackages.cython;
+  cython3 = python3Packages.cython;
 
   dylan = callPackage ../development/compilers/gwydion-dylan {
     dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix {  };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3340e3059f2d..1c36dc7fcd50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1122,6 +1122,24 @@ pythonPackages = modules // import ./python-packages-generated.nix {
     propagatedBuildInputs = [ pythonPackages.coverage ];
   };
 
+  cython = buildPythonPackage rec {
+    name = "Cython-0.20.1";
+  
+    src = fetchurl {
+      url = "http://www.cython.org/release/${name}.tar.gz";
+      sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i";
+    };
+  
+    setupPyBuildFlags = ["--build-base=$out"];
+  
+    buildInputs = [ pkgs.pkgconfig ];
+  
+    meta = {
+      description = "An interpreter to help writing C extensions for Python 2";
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
   cryptacular = buildPythonPackage rec {
     name = "cryptacular-1.4.1";