From 0b8456179e178cd9de38d3e014dd1b5df7efc6ac Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 11 Oct 2024 22:36:47 +0100 Subject: [PATCH 1/3] python3{11,12}Packages.uncompyle6: use `pyproject` --- pkgs/development/python-modules/uncompyle6/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 720ff9bba026..c539946f356e 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, spark-parser, xdis, nose, @@ -14,14 +15,16 @@ buildPythonPackage rec { pname = "uncompyle6"; version = "3.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ spark-parser xdis ]; From 7f99eb06fa4bf7d2729104527ce5226b689fc3de Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 11 Oct 2024 22:36:47 +0100 Subject: [PATCH 2/3] python3{11,12}Packages.uncompyle6: relax spark-parser dependency --- pkgs/development/python-modules/uncompyle6/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index c539946f356e..ec2bcae39a03 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { xdis ]; + pythonRelaxDeps = [ "spark-parser" ]; + nativeCheckInputs = [ nose pytestCheckHook From 4c25f132374fb525563b55afffd7904ca9a82a1e Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 11 Oct 2024 22:36:47 +0100 Subject: [PATCH 3/3] python3{11,12}Packages.uncompyle6: remove nose dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tests don’t use nose and we can’t run them anyway. --- pkgs/development/python-modules/uncompyle6/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index ec2bcae39a03..e5d9b4bef619 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, spark-parser, xdis, - nose, pytestCheckHook, hypothesis, six, @@ -32,7 +30,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "spark-parser" ]; nativeCheckInputs = [ - nose pytestCheckHook hypothesis six @@ -40,7 +37,7 @@ buildPythonPackage rec { # No tests are provided for versions past 3.8, # as the project only targets bytecode of versions <= 3.8 - doCheck = pythonOlder "3.9"; + doCheck = false; meta = { description = "A bytecode decompiler for Python versions 3.8 and below";