about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 15:58:13 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:56 +0200
commita3f18ca87f6b76ad039d1e935658178cce3890f6 (patch)
treeaead9e151572004abaf734de4d7d386dce6ced89
parentc9b960cdffa19e4e03daf90a3d9a7f93a171e640 (diff)
downloadnixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.tar
nixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.tar.gz
nixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.tar.bz2
nixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.tar.lz
nixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.tar.xz
nixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.tar.zst
nixlib-a3f18ca87f6b76ad039d1e935658178cce3890f6.zip
pythonPackages.funcparserlib: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/funcparserlib/default.nix31
-rw-r--r--pkgs/top-level/python-packages.nix23
2 files changed, 32 insertions, 22 deletions
diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix
new file mode 100644
index 000000000000..6c3f5f6d0186
--- /dev/null
+++ b/pkgs/development/python-modules/funcparserlib/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "funcparserlib";
+  version = "0.3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  # Tests are Python 2.x only judging from SyntaxError
+  doCheck = !(isPy3k);
+
+  meta = with stdenv.lib; {
+    description = "Recursive descent parsing library based on functional combinators";
+    homepage = https://code.google.com/p/funcparserlib/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b46925285b0..78991a228cc9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1796,28 +1796,7 @@ in {
     };
   });
 
-  funcparserlib = buildPythonPackage rec {
-    name = "funcparserlib-0.3.6";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/funcparserlib/${name}.tar.gz";
-      sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    # Tests are Python 2.x only judging from SyntaxError
-    doCheck = !(isPy3k);
-
-    meta = {
-      description = "Recursive descent parsing library based on functional combinators";
-      homepage = https://code.google.com/p/funcparserlib/;
-      license = licenses.mit;
-      platforms = platforms.unix;
-    };
-  };
+  funcparserlib = callPackage ../development/python-modules/funcparserlib { };
 
   fastcache = callPackage ../development/python-modules/fastcache { };