From 9b704b809bee3f1d6f487fc0d44e654e77f15137 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Thu, 13 Nov 2025 17:06:16 +0000 Subject: [PATCH] python3Packages.swh-perfecthash: remove swh-perfecthash was renamed to swh-shard see https://gitlab.softwareheritage.org/swh/devel/swh-perfecthash/-/merge_requests/26 follow-up to c7349ac27b92228d69a152fc2f89b25ffd3d8fc3 --- .../swh-perfecthash/default.nix | 62 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 pkgs/development/python-modules/swh-perfecthash/default.nix diff --git a/pkgs/development/python-modules/swh-perfecthash/default.nix b/pkgs/development/python-modules/swh-perfecthash/default.nix deleted file mode 100644 index ec3e2fa0e908..000000000000 --- a/pkgs/development/python-modules/swh-perfecthash/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitLab, - setuptools, - setuptools-scm, - cffi, - pytestCheckHook, - pytest-mock, - pkgs, # only for cmph -}: - -buildPythonPackage rec { - pname = "swh-perfecthash"; - version = "1.3.2"; - pyproject = true; - - src = fetchFromGitLab { - domain = "gitlab.softwareheritage.org"; - group = "swh"; - owner = "devel"; - repo = "swh-perfecthash"; - tag = "v${version}"; - hash = "sha256-cG0h0lfSSooA7Mzrlsi5yIcbkbxQZ7mI5NtiB7D5Crs="; - }; - - build-system = [ - setuptools - setuptools-scm - ]; - - dependencies = [ - cffi - pkgs.cmph - ]; - - # The installed library clashes with the `swh` directory remaining in the source path. - # Usually, we get around this by `rm -rf` the python source files to ensure that the installed package is used. - # Here, we cannot do that as it would also remove the tests which are also in the `swh` directory. - preCheck = '' - rm -rf swh/perfecthash/*.py - ''; - - pythonImportsCheck = [ "swh.perfecthash" ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - ]; - - disabledTests = [ - # Flake tests - "test_build_speed" - ]; - - meta = { - description = "Perfect hash table for software heritage object storage"; - homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-perfecthash"; - license = lib.licenses.gpl3Only; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5bc10d38a8e2..9004fef57ca6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -445,6 +445,7 @@ mapAliases { sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29 subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04 supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29 + swh-perfecthash = throw "'swh-perfecthash' has been renamed to/replaced by 'swh-shard'"; # added 2025-11-13 synologydsm-api = throw "'synologydsm-api' has been renamed to/replaced by 'py-synologydsm-api'"; # Converted to throw 2025-10-29 systemd = throw "systemd was removed because it was misnamed; use systemd-python instead"; # added 2025-11-09 sysv_ipc = throw "'sysv_ipc' has been renamed to/replaced by 'sysv-ipc'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cef0d9710aaf..9c109c9e9cfe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18082,8 +18082,6 @@ self: super: with self; { swh-objstorage = callPackage ../development/python-modules/swh-objstorage { }; - swh-perfecthash = callPackage ../development/python-modules/swh-perfecthash { }; - swh-scanner = callPackage ../development/python-modules/swh-scanner { }; swh-scheduler = callPackage ../development/python-modules/swh-scheduler { };