diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
| commit | 4c6c919a3141b14c3e90607f171e534a82eceeb0 (patch) | |
| tree | 9ea646e0f14fa84fa38a545a4edc33926208db96 /pkgs/development/python-modules/dateparser/default.nix | |
| parent | 335ae386741f74c63cf3bf4b7022a1e5e5f26066 (diff) | |
| parent | fc1224d55dfdde0a3e43635fc9465cdff0bb80a3 (diff) | |
| download | nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.gz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.bz2 nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.lz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.xz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.zst nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/os-specific/linux/kernel/generic.nix
Diffstat (limited to 'pkgs/development/python-modules/dateparser/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/dateparser/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index b73a1e9ec7fc..21deadf146dc 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, isPy3k , nose -, nose-parameterized +, parameterized , mock , glibcLocales , six @@ -23,10 +23,16 @@ buildPythonPackage rec { sha256 = "0q2vyzvlj46r6pr0s6m1a0md1cpg9nv1n3xw286l4x2cc7fj2g3y"; }; + # Replace nose-parameterized by parameterized + prePatch = '' + sed -i s/nose_parameterized/parameterized/g tests/*.py + sed -i s/nose-parameterized/parameterized/g tests/requirements.txt + ''; + # Upstream Issue: https://github.com/scrapinghub/dateparser/issues/364 disabled = isPy3k; - checkInputs = [ nose nose-parameterized mock glibcLocales ]; + checkInputs = [ nose parameterized mock glibcLocales ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py |