From 9441c5dc561fb8c06d7910141a6dea8737848828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Jun 2025 17:16:49 -0700 Subject: [PATCH 1/2] animdl: unpin cssselect --- pkgs/applications/video/animdl/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/applications/video/animdl/default.nix index 3c0fe37dd062..ca7e3abec0ed 100644 --- a/pkgs/applications/video/animdl/default.nix +++ b/pkgs/applications/video/animdl/default.nix @@ -21,7 +21,7 @@ buildPythonApplication { pname = "animdl"; version = "1.7.27"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "justfoolingaround"; @@ -34,7 +34,9 @@ buildPythonApplication { pythonRemoveDeps = [ "comtypes" # windows only ]; + pythonRelaxDeps = [ + "cssselect" "httpx" "lxml" "packaging" @@ -45,10 +47,11 @@ buildPythonApplication { "yarl" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + + dependencies = [ anchor-kr anitopy click From 0726017b4fcf2bece2d8702a6300092589ef57ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Jun 2025 17:20:15 -0700 Subject: [PATCH 2/2] animdl: move to pkgs/by-name --- .../an/animdl/package.nix} | 23 ++++--------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 21 deletions(-) rename pkgs/{applications/video/animdl/default.nix => by-name/an/animdl/package.nix} (82%) diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/by-name/an/animdl/package.nix similarity index 82% rename from pkgs/applications/video/animdl/default.nix rename to pkgs/by-name/an/animdl/package.nix index ca7e3abec0ed..28a2ecab20fd 100644 --- a/pkgs/applications/video/animdl/default.nix +++ b/pkgs/by-name/an/animdl/package.nix @@ -1,24 +1,9 @@ { lib, - buildPythonApplication, fetchFromGitHub, - poetry-core, - anchor-kr, - anitopy, - click, - cssselect, - httpx, - lxml, - packaging, - pkginfo, - pycryptodomex, - pyyaml, - regex, - rich, - tqdm, - yarl, + python3Packages, }: -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "animdl"; version = "1.7.27"; pyproject = true; @@ -47,11 +32,11 @@ buildPythonApplication { "yarl" ]; - build-system = [ + build-system = with python3Packages; [ poetry-core ]; - dependencies = [ + dependencies = with python3Packages; [ anchor-kr anitopy click diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5accf1cff649..09c32d2f97c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16931,8 +16931,6 @@ with pkgs; yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { }); - animdl = python3Packages.callPackage ../applications/video/animdl { }; - dillo = callPackage ../by-name/di/dillo/package.nix { fltk = fltk13; };