Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-11-03 14:01:28 +01:00
36 changed files with 522 additions and 546 deletions

View File

@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "twilio";
version = "6.29.3";
version = "6.32.0";
# tests not included in PyPi, so fetch from github instead
src = fetchFromGitHub {
owner = "twilio";
repo = "twilio-python";
rev = version;
sha256 = "0xc0lw6js8icshjh65rvgbnxrscqsd7ls3h0ni4xqg0kin9wyz42";
sha256 = "0by2qjzxv13k4lvy4mas0hf468xf98qbc2arc8fcy6aj7h8jaam8";
};
buildInputs = [ nose mock ];

View File

@@ -28,11 +28,11 @@
buildPythonPackage rec {
pname = "wxPython";
version = "4.0.6";
version = "4.0.7";
src = fetchPypi {
inherit pname version;
sha256 = "35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37";
sha256 = "0cq2iyqm08ihazh5xzdsha5h22mba0w4a0y7iikn6c6yvszhiriv";
};
doCheck = false;