Martin Weinelt
b79da2786f
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/development/python-modules/bundlewrap/default.nix
pkgs/development/python-modules/coverage/default.nix
pkgs/development/python-modules/h5netcdf/default.nix
pkgs/development/python-modules/hypothesis/default.nix
pkgs/development/python-modules/numba/default.nix
pkgs/development/python-modules/optype/default.nix
pkgs/development/python-modules/setuptools-git-versioning/default.nix
pkgs/development/python-modules/sphinx/default.nix