diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 18:18:17 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 18:18:22 +0100 |
| commit | 8d8324b9584b4653a184bc66e73b1cffc0f61e6e (patch) | |
| tree | dd73950a7212d8cd4d00042cc8c93314cffa0876 | |
| parent | b2631437e1584639f4cb9bbbcbdc8d09a8251ac2 (diff) | |
| parent | 99de1a8ebb9df72642c259de63c4f0d2d1c770e7 (diff) | |
| download | nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.tar nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.tar.gz nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.tar.bz2 nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.tar.lz nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.tar.xz nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.tar.zst nixlib-8d8324b9584b4653a184bc66e73b1cffc0f61e6e.zip | |
Merge staging-next into staging
3 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index ec1707f64c14..f4e7a1090745 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -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 diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 3db00057c90e..c58ec72498a0 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 02ca26960d04..1f0e89d03ace 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -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; { |