Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2019-12-30 18:18:17 +01:00
commit 8d8324b958
3 changed files with 3 additions and 5 deletions

View file

@ -23,8 +23,6 @@ buildPythonPackage rec {
sha256 = "1a08y677lpn80qzvv7z0smgggmr5m5ayf0bs6vds47xpxl9sss5k";
};
checkInputs = [ flaky pytest nose ];
propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
# https://github.com/ipython/ipykernel/pull/377

View file

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "sqlalchemy-utils";
version = "0.35.0";
version = "0.36.0";
src = fetchPypi {
inherit version;
pname = "SQLAlchemy-Utils";
sha256 = "0phsdcnm21qvxd00zmjd6yxbm1s0i7b1q8zrgfy8cqv9xpmz1w01";
sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv";
};
propagatedBuildInputs = [

View file

@ -24,7 +24,7 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [ numpy ]
++ lib.optionals isPy27 [ futures enum34 pathlib ];
++ lib.optionals isPy27 [ futures enum34 pathlib ]
++ lib.optionals isPy3k [ imagecodecs-lite ];
meta = with lib; {