Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2019-09-10 07:06:45 +02:00
82 changed files with 1206 additions and 617 deletions

View File

@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "eth-typing";
version = "2.0.0";
version = "2.1.0";
# Tests are missing from the PyPI source tarball so let's use GitHub
# https://github.com/ethereum/eth-typing/issues/8
@@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "017rshrz9kzax851hdbd3924jmr06h2sx3xdq7m4dwhgz3pgqfcy";
sha256 = "0chrrfw3kdaihgr2ryhljf56bflipzmfxai688xrc2yk7yiqnll5";
};
# setuptools-markdown uses pypandoc which is broken at the moment

View File

@@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "eth-utils";
version = "1.4.1";
version = "1.7.0";
# Tests are missing from the PyPI source tarball so let's use GitHub
# https://github.com/ethereum/eth-utils/issues/130
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "1bwn7b5f0nzvwiw9zs63wy3qhaxvz2fhjp4wj9djp2337d7195h4";
sha256 = "0hhhdz764xgwj5zg3pjzpx10vh54q7kbvlnj9d67qkgwl3fkfgw2";
};
checkInputs = [ pytest hypothesis ];

View File

@@ -16,7 +16,6 @@ buildPythonPackage rec {
checkInputs = [ pytest cffi ];
checkPhase = ''
export PYTHONPATH=.:$PYTHONPATH
py.test
'';
@@ -24,7 +23,7 @@ buildPythonPackage rec {
description = "Universal Python binding for the LMDB 'Lightning' Database";
homepage = "https://github.com/dw/py-lmdb";
license = licenses.openldap;
maintainers = with maintainers; [ copumpkin ];
maintainers = with maintainers; [ copumpkin ivan ];
};
}