From e44ebca0433ad57c10328184f2781dd00c07d3c8 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 13:19:07 +0100 Subject: [PATCH 1/2] nixosTests.freshrss.extensions: replace lxml-stubs with types-lxml lxml-stubs is broken, unmaintained upstream, and advertises types-lxml as its successor [1]. Also don't skip type checking anymore as it now passes. [1] https://github.com/lxml/lxml-stubs --- nixos/tests/freshrss/extensions.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix index d956d4fe32fb..bf624a6041b6 100644 --- a/nixos/tests/freshrss/extensions.nix +++ b/nixos/tests/freshrss/extensions.nix @@ -16,9 +16,8 @@ }; extraPythonPackages = p: [ p.lxml - p.lxml-stubs + p.types-lxml ]; - skipTypeCheck = true; testScript = '' machine.wait_for_unit("multi-user.target") From 4431e491067fdec79029ed10e153db7390738e3d Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 7 Nov 2025 13:21:44 +0100 Subject: [PATCH 2/2] python313Packages.lxml-stubs: drop lxml-stubs is broken, unmaintained upstream, and advertises types-lxml as its successor [1]. [1] https://github.com/lxml/lxml-stubs --- .../python-modules/lxml-stubs/default.nix | 43 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/lxml-stubs/default.nix diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix deleted file mode 100644 index 7562874daaa0..000000000000 --- a/pkgs/development/python-modules/lxml-stubs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - lxml, - pytest-mypy-plugins, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "lxml-stubs"; - version = "0.5.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "lxml"; - repo = "lxml-stubs"; - tag = version; - hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ lxml ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-mypy-plugins - ]; - - disabledTests = [ - # Output difference, https://github.com/lxml/lxml-stubs/issues/101 - "etree_element_iterchildren" - ]; - - meta = with lib; { - description = "Type stubs for the lxml package"; - homepage = "https://github.com/lxml/lxml-stubs"; - license = licenses.asl20; - maintainers = with maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 22b3143b797d..bd55bef928de 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -242,6 +242,7 @@ mapAliases { lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29 logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29 loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29 + lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07 mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29 macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04 Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 451502c1d2ee..455b55c2d238 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8967,8 +8967,6 @@ self: super: with self; { lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { }; - lxml-stubs = callPackage ../development/python-modules/lxml-stubs { }; - lyricwikia = callPackage ../development/python-modules/lyricwikia { }; lz4 = callPackage ../development/python-modules/lz4 { };