From fbf7bd8e768b2befb29cdcddb86eab9dde1af3ec Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Fri, 4 Oct 2024 11:29:03 +0100 Subject: [PATCH] craft-providers: 1.24.2 -> 2.0.3 --- .../python-modules/craft-providers/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 8b91b0005ed5..7dcf2fff8b52 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -5,10 +5,9 @@ nix-update-script, packaging, platformdirs, - pydantic_1, + pydantic, pyyaml, requests-unixsocket, - setuptools, setuptools-scm, urllib3, pytest-check, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.24.2"; + version = "2.0.3"; pyproject = true; @@ -30,7 +29,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-2629Xk2KB1WX3JzAupBWmKg+Ztp5FFJ0x9Xa/w+8tns="; + hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk="; }; patches = [ @@ -52,21 +51,18 @@ buildPythonPackage rec { # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69 # This is already patched in nixpkgs. substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "setuptools==73.0.1" "setuptools" \ --replace-fail "urllib3<2" "urllib3" ''; pythonRelaxDeps = [ "requests" ]; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ packaging platformdirs - pydantic_1 + pydantic pyyaml requests-unixsocket urllib3