From 5e93ac23677bc29ab45a332bf146a7c25607b523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 30 Nov 2023 08:34:53 -0800 Subject: [PATCH] auditwheel: move to python3Packages Otherwise python310.pkgs.playwright fails to build because it uses auditwheel for Python 3.11. --- .../python-modules}/auditwheel/default.nix | 28 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 4 +++ 3 files changed, 24 insertions(+), 10 deletions(-) rename pkgs/{tools/package-management => development/python-modules}/auditwheel/default.nix (74%) diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix similarity index 74% rename from pkgs/tools/package-management/auditwheel/default.nix rename to pkgs/development/python-modules/auditwheel/default.nix index 6ea176ab1ca4..e5aff0c3e7c9 100644 --- a/pkgs/tools/package-management/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -1,32 +1,42 @@ { lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, pyelftools +, importlib-metadata +, pretend +, pytestCheckHook +# non-python dependencies , bzip2 , patchelf -, python3 -, fetchPypi , gnutar , unzip }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "auditwheel"; version = "5.1.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; hash = "sha256-PuWDABSTHqhK9c0GXGN7ZhTvoD2biL2Pv8kk5+0B1ro="; }; - nativeBuildInputs = with python3.pkgs; [ - pbr + nativeBuildInputs = [ + setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ pyelftools - setuptools + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ pretend pytestCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7325b6a4ff4a..27954a699255 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1705,7 +1705,7 @@ with pkgs; audiobookshelf = callPackage ../servers/audiobookshelf { }; - auditwheel = callPackage ../tools/package-management/auditwheel { }; + auditwheel = with python3Packages; toPythonApplication auditwheel; amidst = callPackage ../tools/games/minecraft/amidst { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71803baf74ff..71231ece4d35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -886,6 +886,10 @@ self: super: with self; { auditok = callPackage ../development/python-modules/auditok { }; + auditwheel = callPackage ../development/python-modules/auditwheel { + inherit (pkgs) bzip2 gnutar patchelf unzip; + }; + augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; };