From af9cf1a17eb4fa7efc59f43d6c3f550b519f6c3b Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:13:34 +0300 Subject: [PATCH 1/6] python311Packages.eth-abi: 3.0.1 -> 4.1.0 --- pkgs/development/python-modules/eth-abi/default.nix | 6 +++--- pkgs/development/python-modules/web3/default.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 43d5401ce58f..03c5cc63127b 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "eth-abi"; - version = "3.0.1"; + version = "4.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; rev = "v${version}"; - hash = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; + hash = "sha256-CGAfu3Ovz2WPJOD+4W2+cOAz+wYvuIyFL333Jw66ozA="; }; postPatch = '' substituteInPlace setup.py \ - --replace "parsimonious>=0.8.0,<0.9.0" "parsimonious" + --replace "parsimonious>=0.9.0,<0.10.0" "parsimonious" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 0b285bd514d1..1c88f51345de 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -37,10 +37,6 @@ buildPythonPackage rec { hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ aiohttp eth-abi From 2ad0f0d092ccf887dc23439c73064cdb9d3dc7e4 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:14:10 +0300 Subject: [PATCH 2/6] python311Packages.eth-utils: 2.0.0 -> 2.1.1 * Fixes: - use disabledTestPaths to remove the culprit test case * Changes: - remove mypy to avoid having linter stage in nixpkgs builds --- pkgs/development/python-modules/eth-utils/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 42aa421accf1..08648ab32ecd 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "2.0.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; + hash = "sha256-Ogp4o99smw5qVwDec6zd/xVqqKMyNk41iBfRNzrwuvE="; }; propagatedBuildInputs = [ @@ -29,12 +29,17 @@ buildPythonPackage rec { ] ++ lib.optional (!isPyPy) cytoolz ++ lib.optional isPyPy toolz; - nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; + # Removing a poorly written test case from test suite. + # TODO work with the upstream + disabledTestPaths = [ + "tests/functional-utils/test_type_inference.py" + ]; + pythonImportsCheck = [ "eth_utils" ]; meta = { From 76922ee8503f1eff5862e9867e85d9ac14159453 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:14:42 +0300 Subject: [PATCH 3/6] python311Packages.eth-account: 0.6.1 -> 0.9.0 --- .../python-modules/eth-account/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 38389fc31fe8..fc4062f01c8b 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -7,6 +7,7 @@ , eth-keys , eth-rlp , eth-utils +, websockets , hexbytes , pythonOlder , rlp @@ -14,21 +15,16 @@ buildPythonPackage rec { pname = "eth-account"; - version = "0.6.1"; + version = "0.9.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; rev = "v${version}"; - hash = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; + hash = "sha256-Ps/vzJv0W1+wy1mSJaqRNNU6CoCMchReHIocB9kPrGs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "bitarray>=1.2.1,<1.3.0" "bitarray>=2.4.0,<3" - ''; - propagatedBuildInputs = [ bitarray eth-abi @@ -38,6 +34,7 @@ buildPythonPackage rec { eth-utils hexbytes rlp + websockets ]; # require buildinga npm project From 7e9d3a7f4642432637d01db8ff2592b7d698afa3 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:15:05 +0300 Subject: [PATCH 4/6] python311Packages.eth-hash: 0.3.2 -> 0.5.2 --- pkgs/development/python-modules/eth-hash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index aabd3b38f429..ab5d023f5124 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "eth-hash"; - version = "0.3.2"; + version = "0.5.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-hash"; rev = "v${version}"; - hash = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; + hash = "sha256-6UN+kvLjjAtkmLgUaovjZC/6n3FZtXCwyXZH7ijQObU="; }; nativeCheckInputs = [ From b7128ef551494b9fc992ca55b56d6f54998edf09 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:16:01 +0300 Subject: [PATCH 5/6] python311Packages.web3: 6.3.0 -> 6.5.0 --- .../python-modules/web3/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 1c88f51345de..f4afe0646158 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -16,16 +16,12 @@ , requests , typing-extensions , websockets -# , eth-tester -# , py-geth -, pytestCheckHook , pythonOlder -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "web3"; - version = "6.3.0"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +30,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "web3.py"; rev = "v${version}"; - hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw="; + hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; }; propagatedBuildInputs = [ @@ -56,16 +52,7 @@ buildPythonPackage rec { typing-extensions ] ++ eth-hash.optional-dependencies.pycryptodome; - pythonRelaxDeps = true; - - # TODO: package eth-tester - #nativeCheckInputs = [ - # eth-tester - # eth-tester.optional-dependencies.py-evm - # py-geth - # pytestCheckHook - #]; - + # TODO: package eth-tester required for tests doCheck = false; postPatch = '' From 3b29138b25456a8f868279ac6ce2a1b6c69fef2b Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Thu, 6 Jul 2023 11:54:03 +0300 Subject: [PATCH 6/6] python311Packages.py-eth-sig-utils: mark broken --- pkgs/development/python-modules/py-eth-sig-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 3db729884035..162b2d157069 100644 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -40,5 +40,7 @@ buildPythonPackage rec { homepage = "https://github.com/rmeissner/py-eth-sig-utils"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more. + broken = true; }; }