From 4a87eae13c65b590d4e346b526b6e070f23dbaab Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 1 May 2017 18:12:36 -0300
Subject: [PATCH] rst2html5: put its expression in a separate file

As recommended by @7c6f434c and @FRidh, rst2html5 now resides
in its proper file.
---
 pkgs/tools/text/rst2html5/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 pkgs/top-level/python-packages.nix    | 25 +------------------------
 3 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/text/rst2html5/default.nix

diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix
new file mode 100644
index 000000000000..3d8afd0540ab
--- /dev/null
+++ b/pkgs/tools/text/rst2html5/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+
+  name = "${pname}-${version}";
+  pname = "rst2html5";
+  version = "1.9.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6";
+  };
+
+  propagatedBuildInputs = with pythonPackages;
+  [ docutils genshi pygments beautifulsoup4 ];
+
+  meta = with stdenv.lib;{
+    homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5";
+    description = "Converts ReSTructuredText to (X)HTML5";
+    license = licenses.mit;
+    maintainers = with maintainers; [ AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79f372c46b01..cbb3dd336ca8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3724,6 +3724,8 @@ with pkgs;
 
   redsocks = callPackage ../tools/networking/redsocks { };
 
+  rst2html5 = callPackage ../tools/text/rst2html5 { };
+
   rt = callPackage ../servers/rt { };
 
   rtmpdump = callPackage ../tools/video/rtmpdump { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 765a872651f9..16f669ae67ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22637,30 +22637,7 @@ in {
       homepage = "https://github.com/goinnn/django-multiselectfield";
     };
   };
-
-
-  rst2html5 = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "rst2html5";
-    version = "1.9.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "1js90asy7s0278b4p28inkkp0r7ajr5fk5pcdgcdw628a30vl3i6";
-    };
-
-    propagatedBuildInputs = with self;
-      [ docutils genshi pygments beautifulsoup4 ];
-
-    meta = {
-      homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5";
-      description = "Converts ReSTructuredText to (X)HTML5";
-      license = licenses.mit;
-      maintainers = with maintainers; [ AndersonTorres ];
-    };
-    # TODO: treat rst2html5 as an ordinary package
-  };
-
+  
   reviewboard = buildPythonPackage rec {
     name = "ReviewBoard-2.5.1.1";