mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 23:23:07 +00:00
89023c38fc
I made a mistake merge. Reverting it inc778945806undid the state on master, but now I realize it crippled the git merge mechanism. As the merge contained a mix of commits from `master..staging-next` and other commits from `staging-next..staging`, it got the `staging-next` branch into a state that was difficult to recover. I reconstructed the "desired" state of staging-next tree by: - checking out the last commit of the problematic range:4effe769e2- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken merge commit and its revert from that range (while keeping reapplication from4effe769e2) - merging the last unaffected staging-next commit (803ca85c20) - fortunately no other commits have been pushed to staging-next yet - applying a diff on staging-next to get it into that state
41 lines
982 B
Nix
41 lines
982 B
Nix
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy27
|
|
, nose, chai, simplejson, backports_functools_lru_cache
|
|
, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov
|
|
, pytestCheckHook
|
|
}:
|
|
|
|
buildPythonPackage rec {
|
|
pname = "arrow";
|
|
version = "0.17.0";
|
|
|
|
src = fetchPypi {
|
|
inherit pname version;
|
|
sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4";
|
|
};
|
|
|
|
propagatedBuildInputs = [ python-dateutil ]
|
|
++ lib.optionals isPy27 [ backports_functools_lru_cache ];
|
|
|
|
checkInputs = [
|
|
dateparser
|
|
pytestCheckHook
|
|
pytestcov
|
|
pytest-mock
|
|
pytz
|
|
simplejson
|
|
sphinx
|
|
];
|
|
|
|
# ParserError: Could not parse timezone expression "America/Nuuk"
|
|
disabledTests = [
|
|
"test_parse_tz_name_zzz"
|
|
];
|
|
|
|
meta = with lib; {
|
|
description = "Python library for date manipulation";
|
|
homepage = "https://github.com/crsmithdev/arrow";
|
|
license = licenses.asl20;
|
|
maintainers = with maintainers; [ thoughtpolice ];
|
|
};
|
|
}
|