diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 396d81826841..1af08c97fd1a 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -13,7 +13,6 @@ let python = python3.override { packageOverrides = self: super: { - pydantic = self.pydantic_1; pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec { version = "0.11.2"; src = fetchFromGitHub { @@ -30,10 +29,6 @@ let types-deprecated ]; }); - versioningit = super.versioningit.overridePythonAttrs (old: rec { - # incompatible with pydantic_1 - doCheck = false; - }); }; }; in diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 8d0fe80336c6..36e0d96f9782 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,31 +1,32 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, + pythonOlder, + fetchFromGitHub, more-itertools, setuptools-scm, - pydantic, pytestCheckHook, typeguard, }: buildPythonPackage rec { pname = "inflect"; - version = "7.2.1"; - disabled = isPy27; - format = "pyproject"; + version = "7.3.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-p85eI9Z5hzTyVsGtntUhhrjsJ28QsYzj0+yxnCHrbLY="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "inflect"; + rev = "refs/tags/v${version}"; + hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ more-itertools - pydantic typeguard ];