diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix
new file mode 100644
index 00000000000..a7ae70a4379
--- /dev/null
+++ b/pkgs/development/python-modules/cliapp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, sphinx
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "cliapp";
+  version = "1.20150305";
+  disabled = isPy3k;
+
+  src = fetchgit {
+      url = "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp";
+      rev = "569df8a5959cd8ef46f78c9497461240a5aa1123";
+      sha256 = "882c5daf933e4cf089842995efc721e54361d98f64e0a075e7373b734cd899f3";
+  };
+
+  buildInputs = [ sphinx ];
+
+  # error: invalid command 'test'
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://liw.fi/cliapp/;
+    description = "Python framework for Unix command line programs";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ rickynils ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9bfa2938ef..fe2ffeb3f87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4223,28 +4223,7 @@ in {
 
   hgsvn = callPackage ../development/python-modules/hgsvn { };
 
-  cliapp = buildPythonPackage rec {
-    name = "cliapp-${version}";
-    version = "1.20150305";
-    disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-        url = "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp";
-        rev = "569df8a5959cd8ef46f78c9497461240a5aa1123";
-        sha256 = "882c5daf933e4cf089842995efc721e54361d98f64e0a075e7373b734cd899f3";
-    };
-
-    buildInputs = with self; [ sphinx ];
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://liw.fi/cliapp/;
-      description = "Python framework for Unix command line programs";
-      maintainers = with maintainers; [ rickynils ];
-    };
-  };
+  cliapp = callPackage ../development/python-modules/cliapp { };
 
   cmdtest = buildPythonPackage rec {
     name = "cmdtest-${version}";