diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 79ce3eeca8f4..1cfb8739888d 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -8,30 +8,37 @@ , pytest-benchmark , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pykakasi"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "miurahr"; - repo = pname; + repo = "pykakasi"; rev = "refs/tags/v${version}"; hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "klepto"' "" + ''; + + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ jaconv deprecated + setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index f4a7e207bef3..e80ee6773106 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -9,24 +9,24 @@ let python = python3; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc="; + hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI="; }; - nativeBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ poetry-core pythonRelaxDepsHook ]; pythonRelaxDeps = true; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ spotipy ytmusicapi pytube @@ -43,10 +43,8 @@ in python.pkgs.buildPythonApplication rec { platformdirs pykakasi syncedlyrics - typing-extensions soundcloud-v2 bandcamp-api - setuptools # for pkg_resources ] ++ python-slugify.optional-dependencies.unidecode; nativeCheckInputs = with python.pkgs; [