From 1ecda4bec5379c3c6dc28541ffd41408aad89c10 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 12 Oct 2023 10:50:39 +0900 Subject: python311Packages.distutils-extra: rename from distutils_extra --- pkgs/applications/audio/mpdevil/default.nix | 2 +- pkgs/applications/audio/soundconverter/default.nix | 2 +- pkgs/applications/misc/onboard/default.nix | 2 +- pkgs/applications/misc/ulauncher/default.nix | 2 +- pkgs/applications/misc/variety/default.nix | 2 +- .../applications/office/bookletimposer/default.nix | 2 +- pkgs/applications/video/kazam/default.nix | 2 +- pkgs/desktops/mate/mate-tweak/default.nix | 2 +- .../desktops/xfce/applications/catfish/default.nix | 2 +- .../python-modules/distutils-extra/default.nix | 29 ++++++++++++++++++++++ .../python-modules/distutils_extra/default.nix | 29 ---------------------- pkgs/tools/security/onioncircuits/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 14 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 pkgs/development/python-modules/distutils-extra/default.nix delete mode 100644 pkgs/development/python-modules/distutils_extra/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 92f66d375d3bd..a382450848ca4 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - beautifulsoup4 distutils_extra mpd2 notify-py pygobject3 requests + beautifulsoup4 distutils-extra mpd2 notify-py pygobject3 requests ]; postInstall = '' diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index bc7a6ea5a1f11..e2e5094e84520 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3Packages.gst-python - python3Packages.distutils_extra + python3Packages.distutils-extra python3Packages.setuptools python3Packages.pygobject3 ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 9d88d6331c1da..cdcdb2b1e5149 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; [ dbus-python - distutils_extra + distutils-extra pyatspi pycairo pygobject3 diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 7a466b0e5d861..23e348aad010e 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = with python3Packages; [ - distutils_extra + distutils-extra gobject-introspection intltool wrapGAppsHook diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index db6ab6d6a90db..a5a2085fbf340 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 configobj dbus-python - distutils_extra + distutils-extra httplib2 lxml pillow diff --git a/pkgs/applications/office/bookletimposer/default.nix b/pkgs/applications/office/bookletimposer/default.nix index 6bdaf63b771b7..87dbbbb732f67 100644 --- a/pkgs/applications/office/bookletimposer/default.nix +++ b/pkgs/applications/office/bookletimposer/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = [ gtk3 - (python3.withPackages (ps: with ps; [ distutils_extra pypdf2 pygobject3 ])) + (python3.withPackages (ps: with ps; [ distutils-extra pypdf2 pygobject3 ])) ]; meta = { diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index e44949f54ba61..a2a9d8d112cd4 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3Packages.distutils_extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 19d8f1f5312f7..f4c2d76d52b24 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool - python3Packages.distutils_extra + python3Packages.distutils-extra gobject-introspection ]; diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 9c5d44ade85f1..dd6def83ff4e9 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - python3Packages.distutils_extra + python3Packages.distutils-extra file which intltool diff --git a/pkgs/development/python-modules/distutils-extra/default.nix b/pkgs/development/python-modules/distutils-extra/default.nix new file mode 100644 index 0000000000000..37ef77947b3f6 --- /dev/null +++ b/pkgs/development/python-modules/distutils-extra/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchurl +}: + +buildPythonPackage rec { + pname = "distutils-extra"; + version = "2.50"; + format = "setuptools"; + + src = fetchurl { + url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2"; + hash = "sha256-aq5+JjlzD3fS4+CPxZNjyz2QNfqsChC0w6KRVgbTGwI="; + }; + + # Tests are out-dated as the last upstream release is from 2016 + doCheck = false; + + pythonImportsCheck = [ + "DistUtilsExtra" + ]; + + meta = with lib; { + description = "Enhancements to Python's distutils"; + homepage = "https://launchpad.net/python-distutils-extra"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix deleted file mode 100644 index 37ef77947b3f6..0000000000000 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -}: - -buildPythonPackage rec { - pname = "distutils-extra"; - version = "2.50"; - format = "setuptools"; - - src = fetchurl { - url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2"; - hash = "sha256-aq5+JjlzD3fS4+CPxZNjyz2QNfqsChC0w6KRVgbTGwI="; - }; - - # Tests are out-dated as the last upstream release is from 2016 - doCheck = false; - - pythonImportsCheck = [ - "DistUtilsExtra" - ]; - - meta = with lib; { - description = "Enhancements to Python's distutils"; - homepage = "https://launchpad.net/python-distutils-extra"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 7666e86e01206..c1468becc262d 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection intltool wrapGAppsHook - python3.pkgs.distutils_extra + python3.pkgs.distutils-extra ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a791b8ccd86c8..d9aeda04b9cf0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -95,6 +95,7 @@ mapAliases ({ dictpath = pathable; # added 2023-01-28 diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 + distutils_extra = distutils-extra; # added 2023-10-12 djangorestframework-jwt = drf-jwt; # added 2021-07-20 django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e845f54927d7..040e29e0dc83c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2853,7 +2853,7 @@ self: super: with self; { distro = callPackage ../development/python-modules/distro { }; - distutils_extra = callPackage ../development/python-modules/distutils_extra { }; + distutils-extra = callPackage ../development/python-modules/distutils-extra { }; # LTS in extended support phase django_3 = callPackage ../development/python-modules/django/3.nix { }; -- cgit 1.4.1