Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1525828
This commit is contained in:
Vladimír Čunát
2019-06-18 09:41:36 +02:00
855 changed files with 1664 additions and 1409 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
{ lib, buildPythonPackage, isPy3k, fetchPypi
, urllib3, python-dateutil , pytz, faker, mock, nose }:
buildPythonPackage rec {