From 038cb56df6b7e564ac42d5792404ea27b97c5bdb Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Mon, 9 May 2016 10:39:27 -0700 Subject: [PATCH 1/4] pythonpackages.agate-excel: init agate-excel at 0.1.0 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ff9f4286d4c..6f75f43fb5df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -123,6 +123,25 @@ in modules // { }; }; + agate-excel = buildPythonPackage rec { + name = "agate-excel-0.1.0"; + disabled = isPy3k; + + 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 = "08zvj3pwqw8zhd58iyymiwblrk92y4gl6yyrb2svb0k8za7v0hak"; + }; + }; + # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From d6881e53c9ebc5228a7bd3fffda98aea185a4a0e Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 8 May 2016 22:51:37 -0700 Subject: [PATCH 2/4] pythonpackages.dateutil: init dateutil at 2.2 dateutil_2.2 is required by the csvkit 0.9.1 --- pkgs/top-level/python-packages.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f75f43fb5df..74acd93b827c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4909,6 +4909,27 @@ in modules // { }; }); + # csvkit 0.9.1 needs dateutil==2.2 + dateutil_2_2 = buildPythonPackage (rec { + name = "dateutil-2.2"; + disabled = isPy3k; + + propagatedBuildInputs = with self; [ self.six ]; + + buildInputs = [ pkgs.glibcLocales ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f"; + }; + + meta = { + description = "Powerful extensions to the standard datetime module"; + homepage = http://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; + }); + # Buildbot 0.8.7p1 needs dateutil==1.5 dateutil_1_5 = buildPythonPackage (rec { name = "dateutil-1.5"; @@ -7034,7 +7055,7 @@ in modules // { license = licenses.lgpl3; }; }; - + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; From 2833788f94490c4064097c57d698efbabf27a00f Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 8 May 2016 22:52:38 -0700 Subject: [PATCH 3/4] pythonpackages.openpyxl: init openpyxl at 2.2.0-b1 openpyxl-2.2.0-b1 is needed by csvkit-0.9.1 --- pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74acd93b827c..2cbc7da28cac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13885,6 +13885,31 @@ in modules // { doCheck = false; }; + openpyxl_2_2_0_b1 = buildPythonPackage rec { + version = "2.2.0-b1"; + name = "openpyxl-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/o/openpyxl/${name}.tar.gz"; + sha256 = "0n10pawp2558jrrmppyhkrv7889k3g4mifqj3fp68qbr20ldk51k"; + }; + + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ jdcal et_xmlfile lxml ]; + + # Tests are not included in archive. + # https://bitbucket.org/openpyxl/openpyxl/issues/610 + doCheck = false; + + meta = { + description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; + homepage = https://openpyxl.readthedocs.org; + license = licenses.mit; + maintainers = with maintainers; [ lihop sjourdois ]; + platforms = platforms.all; + }; + }; + openpyxl = buildPythonPackage rec { version = "2.3.3"; name = "openpyxl-${version}"; From eed48a2c90b183fb2d9d13a845ed9fc3c61c6fb5 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sun, 8 May 2016 22:50:25 -0700 Subject: [PATCH 4/4] pythonpackages.csvkit: init csvkit at 0.9.1 csvkit is a suite of utilities for converting to and working with CSV, the king of tabular file formats. --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cbc7da28cac..08e3014317fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2056,6 +2056,26 @@ in modules // { doCheck = false; # lazy packager }; + csvkit = buildPythonPackage rec { + name = "csvkit-${version}"; + version = "0.9.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/csvkit/${name}.tar.gz"; + sha256 = "0fprr4wgp0bq8kl5qims88np11af7ahr5bxkrhfwpdgcgdjbiy4j"; + }; + + propagatedBuildInputs = with self; [ dateutil_2_2 dbf xlrd sqlalchemy openpyxl_2_2_0_b1 ]; + + meta = { + description = "A library of utilities for working with CSV, the king of tabular file formats"; + maintainers = with maintainers; [ vrthra ]; + license = licenses.mit; + homepage = "https://github.com/wireservice/csvkit"; + }; + }; + cx_Freeze = buildPythonPackage rec { name = "cx_freeze-${version}"; version = "4.3.4";