From ca83cf515c04953235e60115eb3dde94e3720031 Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 24 Mar 2024 18:30:59 +0200 Subject: python311Packages.eth-keyfile: 0.6.0 -> 0.8.0 - use pyproject & setuptools-scm - remove the setuptools-markdown post patch --- pkgs/development/python-modules/eth-keyfile/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index b52dde5df2d4c..e8e42a56c60fe 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , eth-keys , eth-utils , pycryptodome @@ -10,22 +11,19 @@ buildPythonPackage rec { pname = "eth-keyfile"; - version = "0.6.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.8.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keyfile"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-JD4bRoD9L0JXcd+bTZrq/BkWw5QGzOi1RvoyLJC77kk="; + hash = "sha256-797yhHuU9/lm96YKxl3SZ5IQAwDxDSYkLkiBdAHh0Uk="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'setuptools-markdown'" "" - ''; + build-system = [ setuptools]; propagatedBuildInputs = [ eth-keys -- cgit 1.4.1 From ad60a863f11b61016b9006128209b6baece608ac Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 24 Mar 2024 18:31:27 +0200 Subject: python311Packages.eth-keys: 0.4.0 -> 0.5.0 - use pyproject & setuptools-scm --- pkgs/development/python-modules/eth-keys/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 3f6c633c6487a..edf83f0657019 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , asn1tools , coincurve , eth-hash @@ -16,17 +17,19 @@ buildPythonPackage rec { pname = "eth-keys"; - version = "0.4.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "0.5.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keys"; rev = "v${version}"; - hash = "sha256-jG/jJPM4t3z6UQIdc8L6y0DxZiGx5pVuGL8XwbIt60o="; + hash = "sha256-vyyaLCG2uIHXX0t93DmFq8/u0rZL+nsBsH2gfgjziyo="; }; + build-system = [ setuptools]; + propagatedBuildInputs = [ eth-typing eth-utils -- cgit 1.4.1 From f064c1cc8fe339f1fef49a0f3382529a1c2d4ce1 Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 24 Mar 2024 18:31:50 +0200 Subject: python311Packages.eth-rlp: 0.3.0 -> 2.1.0 - use pyproject & setuptools-scm --- pkgs/development/python-modules/eth-rlp/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix index 0a54bef3a2c18..081abf233ef91 100644 --- a/pkgs/development/python-modules/eth-rlp/default.nix +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , eth-hash , eth-utils , hexbytes @@ -11,17 +12,19 @@ buildPythonPackage rec { pname = "eth-rlp"; - version = "0.3.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "2.1.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-rlp"; rev = "v${version}"; - hash = "sha256-wfmRjHFu6H3J6hNin8ZA2454xXrLgcUdeR8iGXFomRE="; + hash = "sha256-FTqIutndf+epmO5XNEUoRAUEmn299aTLIZNe5SMcxAQ="; }; + build-system = [ setuptools]; + propagatedBuildInputs = [ hexbytes eth-utils -- cgit 1.4.1 From ed217bf9ef3e3174db63bb998e18cbe8a7cf5a89 Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 24 Mar 2024 18:32:14 +0200 Subject: python311Packages.hexbytes: 0.3.1 -> 1.2.0 - use pyproject & setuptools-scm --- pkgs/development/python-modules/hexbytes/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix index 9bfb9918bf32e..654471ca0f297 100644 --- a/pkgs/development/python-modules/hexbytes/default.nix +++ b/pkgs/development/python-modules/hexbytes/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , eth-utils , hypothesis , pytestCheckHook @@ -9,18 +10,19 @@ buildPythonPackage rec { pname = "hexbytes"; - version = "0.3.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "1.2.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "hexbytes"; rev = "refs/tags/v${version}"; - hash = "sha256-19oY/VPP6qkxHCkIgpC28fOOYKEYcNbVVGoHJmMmOl8="; + hash = "sha256-8st1nQiGApt+aNl8/cftYk0ZzA+MxbLyGi53UWUlAjM="; }; + build-system = [ setuptools]; + nativeCheckInputs = [ eth-utils hypothesis -- cgit 1.4.1 From ae93076f570e692bcd9fafa11a2832ad5dc1fee7 Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 24 Mar 2024 18:32:37 +0200 Subject: python311Packages.rlp: 3.0.0 -> 4.0.0 - use pyproject & setuptools-scm - remove the setuptools-markdown post patch --- pkgs/development/python-modules/rlp/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index 9938ad1c44102..8aeee9d0dd9c2 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, setuptools , buildPythonPackage , eth-utils , hypothesis @@ -8,20 +9,17 @@ buildPythonPackage rec { pname = "rlp"; - version = "3.0.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "pyrlp"; rev = "v${version}"; - hash = "sha256-GRCq4FU38e08fREg5fweig5Y60jLT2k3Yj1Jk8OA6XY="; + hash = "sha256-cRp+ZOPYs9kcqMKGaiYMOFBY+aPCyFqu+1/5wloLwqU="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'setuptools-markdown'" "" - ''; + build-system = [ setuptools]; propagatedBuildInputs = [ eth-utils -- cgit 1.4.1 From 77e8d6f0583d251b8f645d216ca9ac0eb436238f Mon Sep 17 00:00:00 2001 From: hellwolf Date: Sun, 24 Mar 2024 18:43:18 +0200 Subject: slither-analyzer: add testing in the check phase - use setuptools-scm --- .../python-modules/slither-analyzer/default.nix | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index bccc5b97f7283..d188aa1557c49 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -7,7 +7,7 @@ , packaging , prettytable , pythonOlder -, setuptools +, setuptools-scm , solc , web3 , withSolc ? false @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ makeWrapper - setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -68,14 +68,19 @@ buildPythonPackage rec { "slither.vyper_parsing" ]; - # No Python tests - doCheck = false; + # Test if the binary works during the build phase. + checkPhase = '' + runHook preCheck - passthru.tests = { - version = testers.testVersion { - package = slither-analyzer; - command = "HOME=$TMPDIR slither --version"; - }; + HOME="$TEMP" $out/bin/slither --version + + runHook postCheck + ''; + + passthru.tests.version = testers.testVersion { + package = slither-analyzer; + command = "HOME=$TMPDIR slither --version"; + version = "${version}"; }; meta = with lib; { -- cgit 1.4.1 From 95eca14cb709bad9603dbf18e5fab0e43d55b66c Mon Sep 17 00:00:00 2001 From: hellwolf Date: Mon, 8 Apr 2024 23:56:08 +0300 Subject: slither-analyzer: 0.10.1 -> 0.10.2 --- pkgs/development/python-modules/slither-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index d188aa1557c49..2dc276bac48b0 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-MjO2ZYFat+byH0DEt2v/wPXaYL2lmlESgQCZXD4Jpt0="; + hash = "sha256-KmbmljtmMtrJxgSMJjQ8fdk6RpEXcAVBuo24EsyMV8k="; }; nativeBuildInputs = [ -- cgit 1.4.1