From 4365d634c8ed6a37e898820cbc888194a96013e8 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Tue, 2 May 2017 21:10:26 -0700 Subject: [PATCH] agate-excel: refactor --- .../python-modules/agate-excel/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +-------------- 2 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/agate-excel/default.nix diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix new file mode 100644 index 00000000000..cb0113c22b3 --- /dev/null +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, agate, openpyxl, xlrd }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate-excel"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7"; + }; + + propagatedBuildInputs = [ agate openpyxl xlrd ]; + + meta = with stdenv.lib; { + description = "Adds read support for excel files to agate"; + homepage = "https://github.com/wireservice/agate-excel"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45307356282..1ff8f7d7d09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -120,23 +120,7 @@ in { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; - agate-excel = buildPythonPackage rec { - name = "agate-excel-0.2.1"; - - meta = { - description = "Adds read support for excel files to agate"; - homepage = "https://github.com/wireservice/agate-excel"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; - - propagatedBuildInputs = with self; [ agate openpyxl xlrd ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/agate-excel/${name}.tar.gz"; - sha256 = "1d28s01a0a8n8rdrd78w88cqgl3lawzy38h9afwm0iks618i0qn7"; - }; - }; + agate-excel = callPackage ../development/python-modules/agate-excel { }; agate-sql = buildPythonPackage rec { name = "agate-sql-0.5.2";