diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix similarity index 63% rename from pkgs/tools/package-management/auditwheel/default.nix rename to pkgs/development/python-modules/auditwheel/default.nix index 6ea176ab1ca4..836bbaf1cd0f 100644 --- a/pkgs/tools/package-management/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -1,32 +1,42 @@ { lib -, bzip2 -, patchelf -, python3 +, buildPythonPackage +, pythonOlder , fetchPypi +, setuptools-scm +, pyelftools +, importlib-metadata +, pretend +, pytestCheckHook +# non-python dependencies +, bzip2 , gnutar +, patchelf , unzip }: -python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "auditwheel"; - version = "5.1.2"; - format = "setuptools"; + version = "5.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PuWDABSTHqhK9c0GXGN7ZhTvoD2biL2Pv8kk5+0B1ro="; + hash = "sha256-qvgVOreinMmaZjziSYgE2vGIfqG3oyMboNP+5oo8zxk="; }; - 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 ]; @@ -46,6 +56,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { + changelog = "https://github.com/pypa/auditwheel/blob/${version}/CHANGELOG.md"; description = "Auditing and relabeling cross-distribution Linux wheels"; homepage = "https://github.com/pypa/auditwheel"; license = with licenses; [ @@ -53,6 +64,7 @@ python3.pkgs.buildPythonApplication rec { bsd2 # from https://github.com/matthew-brett/delocate bsd3 # from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py ]; + mainProgram = "auditwheel"; maintainers = with maintainers; [ davhau ]; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 626130398121..5f298922cfe6 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -205,6 +205,7 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; + maintainers = teams.jupyter.members; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 004930491a39..575ffeff5a6b 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -55,6 +55,8 @@ buildPythonPackage rec { --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.41.2", "auditwheel==5.4.0"]' \ 'requires = ["setuptools", "setuptools-scm", "wheel", "auditwheel"]' \ --replace 'version_file = "playwright/_repo_version.py"' "" + # FIXME version_file is available in setuptools-scm>=8.0.0 + echo "__version__ = version = '${version}'" > playwright/_repo_version.py # Skip trying to download and extract the driver. # This is done manually in postInstall instead. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13b0c3004e40..93d218bf9f39 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 d1bcceccafb3..9b903c10aa5d 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; };