From 266ebed4a8750c48928f8e1a9a8cc8295a1843dc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:30:03 -0400 Subject: [PATCH] pythonPackages.enum34: refactor move to python-modules --- .../python-modules/enum34/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/enum34/default.nix diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix new file mode 100644 index 000000000000..a5175eba49d8 --- /dev/null +++ b/pkgs/development/python-modules/enum34/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, python +}: + +if pythonAtLeast "3.4" then null else buildPythonPackage rec { + pname = "enum34"; + version = "1.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/enum34; + description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; + license = licenses.bsd0; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7668070403e..2bc713d39ff2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2350,27 +2350,7 @@ in { enum-compat = callPackage ../development/python-modules/enum-compat { }; - enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec { - pname = "enum34"; - version = "1.1.6"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - - meta = { - homepage = https://pypi.python.org/pypi/enum34; - description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; - license = "BSD"; - }; - }; + enum34 = callPackage ../development/python-modules/enum34 { }; epc = buildPythonPackage rec { name = "epc-0.0.3";