From 92896e2739bd681150c317f7834991a2c361d963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Mar 2018 03:27:11 +0100 Subject: [PATCH] pythonPackages.ftputil: move expression --- .../python-modules/ftputil/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------------ 2 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/ftputil/default.nix diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix new file mode 100644 index 00000000000..8d9daa154e2 --- /dev/null +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + version = "3.3"; + pname = "ftputil"; + + src = fetchPypi { + inherit pname version; + sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b"; + }; + + disabled = isPy3k; + + meta = with lib; { + description = "High-level FTP client library (virtual file system and more)"; + homepage = https://pypi.python.org/pypi/ftputil; + license = licenses.bsd2; # "Modified BSD license, says pypi" + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fccdf0097f..0fb4e9cd805 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4512,24 +4512,7 @@ in { }; }; - ftputil = buildPythonPackage rec { - version = "3.3"; - name = "ftputil-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/ftputil/${name}.tar.gz"; - sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b"; - }; - - disabled = isPy3k; - - meta = { - description = "High-level FTP client library (virtual file system and more)"; - homepage = https://pypi.python.org/pypi/ftputil; - platforms = platforms.linux; - license = licenses.bsd2; # "Modified BSD license, says pypi" - }; - }; + ftputil = callPackage ../development/python-modules/ftputil { }; fudge = buildPythonPackage rec { name = "fudge-1.1.0";