From 3e75b475f83713567e3d305dd3814ba93bc13f10 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:31:34 +0100
Subject: [PATCH] python pyx: 0.10 -> 0.14.1 rewrite expression

- Update version
- Rewrite expression using buildPythonPackage
- Current version only works of PyX only works with Python >= 3.2
---
 .../python-modules/pyx/default.nix            | 40 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-packages.nix            | 18 +++++++++
 3 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyx/default.nix

diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix
deleted file mode 100644
index cc36680fcb0..00000000000
--- a/pkgs/development/python-modules/pyx/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{stdenv, fetchurl, python, makeWrapper}:
-
-stdenv.mkDerivation rec {
-  name = "PyX-0.10";
-  src = fetchurl {
-    url = "mirror://sourceforge/pyx/${name}.tar.gz";
-    sha256 = "dfaa4a7790661d67d95f80b22044fdd8a9922483631950296ff1d7a9f85c8bba";
-  };
-
-  patchPhase = ''
-    substituteInPlace ./setup.py --replace '"/etc"' '"etc"'
-  '';
-
-  buildInputs = [python makeWrapper];
-  buildPhase = "python ./setup.py build";
-  installPhase = ''
-    python ./setup.py install --prefix="$out" || exit 1
-
-    for i in "$out/bin/"*
-    do
-      # FIXME: We're assuming Python 2.4.
-      wrapProgram "$i" --prefix PYTHONPATH :  \
-       "$out/lib/python2.4/site-packages" ||  \
-        exit 2
-    done
-  '';
-
-  meta = {
-    description = ''Python graphics package'';
-    longDescription = ''
-      PyX is a Python package for the creation of PostScript and PDF
-      files. It combines an abstraction of the PostScript drawing
-      model with a TeX/LaTeX interface. Complex tasks like 2d and 3d
-      plots in publication-ready quality are built out of these
-      primitives.
-    '';
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://pyx.sourceforge.net/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06f01abee73..a920636a3d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9057,8 +9057,6 @@ let
 
   pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { };
 
-  pyx = callPackage ../development/python-modules/pyx { };
-
   pyxml = callPackage ../development/python-modules/pyxml { };
 
   rbtools = callPackage ../development/python-modules/rbtools { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5f9c3187020..d3f2b076902 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14450,6 +14450,24 @@ in modules // {
     };
   };
 
+  pyx = buildPythonPackage rec {
+    name = "pyx-${version}";
+    version = "0.14.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyX/PyX-${version}.tar.gz";
+      sha256 = "05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912";
+    };
+
+    disabled = !isPy3k;
+
+    meta = {
+      description = "Python package for the generation of PostScript, PDF, and SVG files";
+      homepage = http://pyx.sourceforge.net/;
+      license = with licenses; [ gpl2 ];
+    };
+  };
+
   mmpython = buildPythonPackage rec {
     version = "0.4.10";
     name = "mmpython-${version}";