diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index a6ac2604f08fc..3452277c1fe57 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -1,27 +1,22 @@ { lib -, buildPythonApplication -, fetchPypi -, pythonOlder -, poetry-core -, aiohttp -, aiofiles -, biliass -, dicttoxml -, colorama +, python3 , ffmpeg , makeWrapper +, nix-update-script }: +with python3.pkgs; + buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b15"; + version = "2.0.0b16"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-TOFApMwY2WRYg2H2N0PIjylYFKnTHdszdU+AFgLYYwc="; + hash = "sha256-aGmayZGXmEyVuUKDKrgcYuPKsib/c5ou5CZ+Sag6Evk="; }; nativeBuildInputs = [ @@ -42,6 +37,10 @@ buildPythonApplication rec { pythonImportsCheck = [ "yutto" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A Bilibili downloader"; homepage = "https://github.com/yutto-dev/yutto"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bf8a40956493..fc6528a78427e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33199,7 +33199,7 @@ with pkgs; ytmdl = callPackage ../tools/misc/ytmdl { }; - yutto = with python3.pkgs; toPythonApplication yutto; + yutto = callPackage ../tools/misc/yutto { }; yuview = libsForQt5.yuview; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 330aede22384d..dd646f8b08e0c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12134,8 +12134,6 @@ self: super: with self; { yubico-client = callPackage ../development/python-modules/yubico-client { }; - yutto = callPackage ../tools/misc/yutto { }; - z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; z3 = (toPythonModule (pkgs.z3.override {