From da31c0c8d04dbf490fcf43a1540b7d2254a7be72 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 4 Aug 2025 12:33:02 -0700 Subject: [PATCH 1/2] python3Packages.identify: remove editdistance-s dependency --- pkgs/development/python-modules/identify/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index f59607f9981e..114d232e0af7 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - editdistance-s, fetchFromGitHub, pytestCheckHook, pythonOlder, + cffi, setuptools, ukkonen, }: @@ -26,18 +26,18 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - editdistance-s + cffi pytestCheckHook ukkonen ]; pythonImportsCheck = [ "identify" ]; - meta = with lib; { + meta = { description = "File identification library for Python"; - homepage = "https://github.com/chriskuehl/identify"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + homepage = "https://github.com/pre-commit/identify"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "identify-cli"; }; } From fd16fc7d51b008069881b178d1452bcffa2508a4 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Mon, 4 Aug 2025 12:33:20 -0700 Subject: [PATCH 2/2] python3Packages.editdistance-s: remove --- .../python-modules/editdistance-s/default.nix | 35 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/development/python-modules/editdistance-s/default.nix diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix deleted file mode 100644 index a50fe7321dfc..000000000000 --- a/pkgs/development/python-modules/editdistance-s/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - cffi, -}: - -buildPythonPackage rec { - pname = "editdistance-s"; - version = "1.0.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "asottile"; - repo = "editdistance-s"; - rev = "v${version}"; - sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg"; - }; - - propagatedNativeBuildInputs = [ cffi ]; - - propagatedBuildInputs = [ cffi ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "editdistance_s" ]; - - meta = with lib; { - description = "Fast implementation of the edit distance (Levenshtein distance)"; - homepage = "https://github.com/asottile/editdistance-s"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ austinbutler ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 307b307774ff..c94f5c591ceb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -230,6 +230,7 @@ mapAliases ({ dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12 + editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7457cb63d539..2b1122b5c61e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4527,8 +4527,6 @@ self: super: with self; { editdistance = callPackage ../development/python-modules/editdistance { }; - editdistance-s = callPackage ../development/python-modules/editdistance-s { }; - editdistpy = callPackage ../development/python-modules/editdistpy { }; editor = callPackage ../development/python-modules/editor { };