From 438d5c64ee577be8c3d4ffca4e79544385ed24fe Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 9 Jul 2024 13:12:53 +0200 Subject: [PATCH] charmcraft: use `setuptools.dist` rather than `distutils.util` --- pkgs/by-name/ch/charmcraft/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 6c340102a502..471526aa603e 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -22,6 +22,9 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ --replace-fail 'version=determine_version()' 'version="${version}"' + + substituteInPlace charmcraft/env.py \ + --replace-fail "distutils.util" "setuptools.dist" ''; propagatedBuildInputs = with python3Packages; [ @@ -59,6 +62,7 @@ python3Packages.buildPythonApplication rec { pytest-subprocess pytestCheckHook responses + setuptools ] ++ [ git ]; preCheck = ''