From 4036bc91da25b31f846431ee6dce77b6f48d4c06 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Tue, 2 May 2017 21:08:10 -0700 Subject: [PATCH] agate: refactor --- .../python-modules/agate/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/agate/default.nix diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix new file mode 100644 index 00000000000..3ff097a78cf --- /dev/null +++ b/pkgs/development/python-modules/agate/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, + discid, six, parsedatetime, isodate, Babel, pytimeparse, + leather, python-slugify }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate"; + version = "1.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm"; + }; + + propagatedBuildInputs = [ discid six parsedatetime + isodate Babel pytimeparse leather python-slugify ]; + + doCheck = !isPy3k; + # (only) on python3 unittest loader (loadTestsFromModule) fails + + meta = with stdenv.lib; { + description = "A Python data analysis library that is optimized for humans instead of machines"; + homepage = https://github.com/wireservice/agate; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ vrthra ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63fefc324d8..8bb828402bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -114,27 +114,7 @@ in { aenum = callPackage ../development/python-modules/aenum { }; - agate = buildPythonPackage rec { - name = "agate-1.6.0"; - - meta = { - description = "A Python data analysis library that is optimized for humans instead of machines"; - homepage = "https://github.com/wireservice/agate"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; - - doCheck = false; - # (only) on python3 unittest loader (loadTestsFromModule) fails - - propagatedBuildInputs = with self; [ discid six parsedatetime isodate Babel - pytimeparse leather python-slugify ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/agate/${name}.tar.gz"; - sha256 = "02pb5jjvzjqfpsa7q12afbk9nqj06xdpw1s7qa6a1bnalikfniqm"; - }; - }; + agate = callPackage ../development/python-modules/agate { }; phonenumbers = callPackage ../development/python-modules/phonenumbers { };