Merge pull request #10485 from layus/fix1

python-docker-py: fix dependency: requests -> requests2
This commit is contained in:
Arseniy Seroka 2015-10-20 10:24:39 +03:00
commit 6479f8c1f4

View file

@ -3122,7 +3122,7 @@ let
md5 = "07a5f41fd3f8cc72d05deed628700e99";
};
propagatedBuildInputs = with self; [ six requests websocket_client ];
propagatedBuildInputs = with self; [ six requests2 websocket_client ];
# Version conflict
doCheck = false;
@ -7226,7 +7226,7 @@ let
disabled = isPy3k;
propagatedBuildInputs = with self; [
requests2 # Needs to be first, no idea why...
requests2
cgroup-utils docker-custom docutils lti mock pygments
pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
websocket_client watchdog webpy-custom