summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-16 14:24:38 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:59 +0200
commit29ac3c651d5ab845cbba144b51d27474f7f6a095 (patch)
treee1cd08dd145fe3988038a25bd9c2e44a72d91cf4 /pkgs
parent9d8fa906473b83d216eb98f644f2a067086dba62 (diff)
downloadnixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.tar
nixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.tar.gz
nixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.tar.bz2
nixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.tar.lz
nixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.tar.xz
nixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.tar.zst
nixlib-29ac3c651d5ab845cbba144b51d27474f7f6a095.zip
pythonPackages.elpy: refactor move to python-modules
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/elpy/default.nix32
-rw-r--r--pkgs/top-level/python-packages.nix19
2 files changed, 33 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/elpy/default.nix b/pkgs/development/python-modules/elpy/default.nix
new file mode 100644
index 000000000000..79ec94a2c828
--- /dev/null
+++ b/pkgs/development/python-modules/elpy/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, rope
+, flake8
+, autopep8
+, jedi
+, importmagic
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "elpy";
+  version = "1.9.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0";
+  };
+
+  propagatedBuildInputs = [ flake8 autopep8 jedi importmagic ]
+    ++ stdenv.lib.optionals isPy27 [ rope ];
+
+  doCheck = false; # there are no tests
+
+  meta = with stdenv.lib; {
+    description = "Backend for the elpy Emacs mode";
+    homepage = "https://github.com/jorgenschaefer/elpy";
+    license = licenses.gpl3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb282b8e8742..fb133d40fefb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2344,24 +2344,7 @@ in {
 
   effect = callPackage ../development/python-modules/effect {};
 
-  elpy = buildPythonPackage rec {
-    name = "elpy-${version}";
-    version = "1.9.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/elpy/${name}.tar.gz";
-      sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0";
-    };
-    python2Deps = if isPy3k then [ ] else [ self.rope ];
-    propagatedBuildInputs = with self; [ flake8 autopep8 jedi importmagic ] ++ python2Deps;
-
-    doCheck = false; # there are no tests
-
-    meta = {
-      description = "Backend for the elpy Emacs mode";
-      homepage = "https://github.com/jorgenschaefer/elpy";
-    };
-  };
-
+  elpy = callPackage ../development/python-modules/elpy { };
 
   enum = buildPythonPackage rec {
     name = "enum-0.4.4";