From ef21cc74e2f16da0cf71a496b6b5f5a889729bc1 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 10 Nov 2024 17:14:09 +0800 Subject: [PATCH] python3Packages.us: switch to pyproject --- .../development/python-modules/us/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index d6d2b53731c7..b80106ab493c 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -6,12 +6,15 @@ pytestCheckHook, pythonOlder, pytz, + setuptools, }: buildPythonPackage rec { pname = "us"; version = "3.2.0"; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; disabled = pythonOlder "3.6"; @@ -20,13 +23,9 @@ buildPythonPackage rec { hash = "sha256-yyI+hTk9zFFx6tDdISutxH+WZ7I3AP6j5+pfMQ1UUzg="; }; - postPatch = '' - # Upstream spins jellyfish - substituteInPlace setup.py \ - --replace "jellyfish==" "jellyfish>=" - ''; - - propagatedBuildInputs = [ jellyfish ]; + propagatedBuildInputs = [ + jellyfish + ]; nativeCheckInputs = [ pytestCheckHook @@ -35,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "us" ]; - meta = with lib; { + meta = { description = "Package for easily working with US and state metadata"; mainProgram = "states"; longDescription = '' @@ -45,7 +44,7 @@ buildPythonPackage rec { census, congressional districts, counties, and census tracts. ''; homepage = "https://github.com/unitedstates/python-us/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; }