Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b4645c3783ca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 683c5794b0fa
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 14, 2018

  1. pythonPackages.csvkit: fix build 

    (cherry picked from commit c0466ef)
    Robert Schütz committed Mar 14, 2018
    Copy the full SHA
    683c579 View commit details
Showing with 31 additions and 21 deletions.
  1. +31 −21 pkgs/development/python-modules/csvkit/default.nix
52 changes: 31 additions & 21 deletions pkgs/development/python-modules/csvkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
{ stdenv, fetchPypi, buildPythonPackage,
dateutil, dbf, xlrd, sqlalchemy, openpyxl,
agate-excel, agate-dbf, agate-sql, isPy3k }:
{ lib, fetchPypi, buildPythonPackage, isPy3k
, agate, agate-excel, agate-dbf, agate-sql, six
, argparse, ordereddict, simplejson
, glibcLocales, nose, mock, unittest2
}:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "csvkit";
version = "1.0.2";
pname = "csvkit";
version = "1.0.2";

src = fetchPypi {
inherit pname version;
sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
};
src = fetchPypi {
inherit pname version;
sha256 = "05vfsba9nwh4islszgs18rq8sjkpzqni0cdwvvkw7pi0r63pz2as";
};

propagatedBuildInputs = [ dateutil dbf xlrd sqlalchemy openpyxl
agate-excel agate-dbf agate-sql ];
propagatedBuildInputs = [
agate agate-excel agate-dbf agate-sql six
] ++ lib.optionals (!isPy3k) [
argparse ordereddict simplejson
];

doCheck = !isPy3k;
# (only) python 3 we had 9 failures and 57 errors out of a much larger
# number of tests.
checkInputs = [
glibcLocales nose
] ++ lib.optionals (!isPy3k) [
mock unittest2
];

meta = with stdenv.lib; {
description = "A library of utilities for working with CSV, the king of tabular file formats";
maintainers = with maintainers; [ vrthra ];
license = with licenses; [ mit ];
homepage = https://github.com/wireservice/csvkit;
};
checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests -e test_csvsql
'';

meta = with lib; {
description = "A library of utilities for working with CSV, the king of tabular file formats";
maintainers = with maintainers; [ vrthra ];
license = with licenses; [ mit ];
homepage = https://github.com/wireservice/csvkit;
};
}