From 6af8b42e17319bcc436546793fcba20497366e4f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 26 Oct 2018 13:16:32 -0400 Subject: [PATCH] pythonPackages.setuptoolsTrial: refactor move to python-modules --- .../setuptoolstrial/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 26 +------------ 2 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/setuptoolstrial/default.nix diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix new file mode 100644 index 000000000000..b393d0eb2003 --- /dev/null +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, virtualenv +, pytestrunner +, pytest-virtualenv +, twisted +, pathlib2 +}: + +buildPythonPackage rec { + pname = "setuptools_trial"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; + }; + + buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ]; + propagatedBuildInputs = [ twisted pathlib2 ]; + + postPatch = '' + sed -i '12,$d' tests/test_main.py + ''; + + # Couldn't get tests working + doCheck = false; + + meta = with stdenv.lib; { + description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; + homepage = "https://github.com/rutsky/setuptools-trial"; + license = licenses.bsd2; + maintainers = with maintainers; [ ryansydnor nand0p ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75634c88c48e..b8409f8001f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3710,31 +3710,7 @@ in { setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; - setuptoolsTrial = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "setuptools_trial"; - version = "0.6.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; - }; - buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; - propagatedBuildInputs = with self; [ twisted pathlib2 ]; - postPatch = '' - sed -i '12,$d' tests/test_main.py - ''; - - # Couldn't get tests working - doCheck = false; - - meta = { - description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; - homepage = "https://github.com/rutsky/setuptools-trial"; - license = licenses.bsd2; - maintainers = with maintainers; [ ryansydnor nand0p ]; - platforms = platforms.all; - }; - }; + setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; shippai = callPackage ../development/python-modules/shippai {};