Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2019-09-22 16:39:56 +02:00
35 changed files with 1010 additions and 691 deletions

View File

@@ -1,16 +1,16 @@
{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }:
{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
buildPythonPackage rec {
pname = "Flask-SQLAlchemy";
version = "2.3.2";
version = "2.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar";
sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc";
};
propagatedBuildInputs = [ flask sqlalchemy ];
checkInputs = [ pytest ];
checkInputs = [ mock pytest ];
checkPhase = ''
pytest

View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pdf2image";
version = "1.4.2";
version = "1.9.0";
propagatedBuildInputs = [ pillow poppler_utils ];
src = fetchPypi {
inherit pname version;
sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e";
sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn";
};
meta = with stdenv.lib; {