diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix
new file mode 100644
index 00000000000..29af19aaf99
--- /dev/null
+++ b/pkgs/development/python-modules/hgsvn/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, hglib
+, isPy3k
+, isPyPy
+}:
+
+buildPythonPackage rec {
+  pname = "hgsvn";
+  version = "0.3.11";
+  disabled = isPy3k || isPyPy;
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p";
+  };
+
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [ hglib ];
+
+  doCheck = false;  # too many assumptions
+
+  meta = with stdenv.lib; {
+    homepage = https://pypi.python.org/pypi/hgsvn;
+    description = "A set of scripts to work locally on Subversion checkouts using Mercurial";
+    license = licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8909d575f6b..c9bfa2938ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4221,23 +4221,7 @@ in {
 
   zope_interface = callPackage ../development/python-modules/zope_interface { };
 
-
-  hgsvn = buildPythonPackage rec {
-    name = "hgsvn-0.3.11";
-    src = pkgs.fetchurl rec {
-      url = "mirror://pypi/h/hgsvn/${name}-hotfix.zip";
-      sha256 = "0yvhwdh8xx8rvaqd3pnnyb99hfa0zjdciadlc933p27hp9rf880p";
-    };
-    disabled = isPy3k || isPyPy;
-    doCheck = false;  # too many assumptions
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ hglib ];
-
-    meta = {
-      homepage = https://pypi.python.org/pypi/hgsvn;
-    };
-  };
+  hgsvn = callPackage ../development/python-modules/hgsvn { };
 
   cliapp = buildPythonPackage rec {
     name = "cliapp-${version}";