From 67988e545ca96f7d5eeaffbfac09e511c9fd228f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 18:00:18 -0400 Subject: [PATCH] pythonPacakges.moviepy: refactor move to python-modules --- .../python-modules/moviepy/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/moviepy/default.nix diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix new file mode 100644 index 00000000000..63613b51686 --- /dev/null +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, decorator +, imageio +, tqdm +}: + +buildPythonPackage rec { + pname = "moviepy"; + version = "0.2.2.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "d937d817e534efc54eaee2fc4c0e70b48fcd81e1528cd6425f22178704681dc3"; + }; + + # No tests + doCheck = false; + propagatedBuildInputs = [ numpy decorator imageio tqdm ]; + + meta = with stdenv.lib; { + description = "Video editing with Python"; + homepage = http://zulko.github.io/moviepy/; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d95b17bcd7f..4228ad2f35f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2775,25 +2775,7 @@ in { }; }; - moviepy = buildPythonPackage rec { - name = "moviepy-${version}"; - version = "0.2.2.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/moviepy/${name}.tar.gz"; - sha256 = "d937d817e534efc54eaee2fc4c0e70b48fcd81e1528cd6425f22178704681dc3"; - }; - - # No tests - doCheck = false; - propagatedBuildInputs = with self; [ numpy decorator imageio tqdm ]; - - meta = { - description = "Video editing with Python"; - homepage = http://zulko.github.io/moviepy/; - license = licenses.mit; - }; - }; + moviepy = callPackage ../development/python-modules/moviepy { }; mozterm = callPackage ../development/python-modules/mozterm { };