From e13b240359d51af91400d6fb2c1c1ae720502926 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Tue, 2 May 2017 21:12:09 -0700 Subject: [PATCH] agate-sql: refactor --- .../python-modules/agate-sql/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/agate-sql/default.nix diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix new file mode 100644 index 000000000000..0167b40ea43f --- /dev/null +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "agate-sql"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14"; + }; + + propagatedBuildInputs = [ agate sqlalchemy ]; + + meta = with stdenv.lib; { + description = "Adds SQL read/write support to agate."; + homepage = https://github.com/wireservice/agate-sql; + 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 1ff8f7d7d094..aeee6b08eb78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -122,23 +122,7 @@ in { agate-excel = callPackage ../development/python-modules/agate-excel { }; - agate-sql = buildPythonPackage rec { - name = "agate-sql-0.5.2"; - - meta = { - description = "Adds SQL read/write support to agate."; - homepage = https://github.com/wireservice/agate-sql; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; - - propagatedBuildInputs = with self; [ agate sqlalchemy ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/agate-sql/${name}.tar.gz"; - sha256 = "0qlfwql6fnbs0r1rj7nxv4n5scad53b8dlh4qv6gyklvdk3wwn14"; - }; - }; + agate-sql = callPackage ../development/python-modules/agate-sql { }; ansicolor = buildPythonPackage rec { name = "ansicolor-${version}";