From a72b3aee328ceae5b8e61b2259463a9095923bbf Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Wed, 21 Jan 2026 17:42:30 +0100 Subject: [PATCH 1/2] python3Packages.ypy-websocket: drop This package was archived upstream [1]. [1] https://github.com/y-crdt/ypy-websocket --- .../python-modules/jupyter-ydoc/default.nix | 6 +- .../python-modules/ypy-websocket/default.nix | 68 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/python-modules/ypy-websocket/default.nix diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 89426c8b90e1..421e16fbe59d 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -12,8 +12,8 @@ pytestCheckHook, # tests + pycrdt-websocket, websockets, - ypy-websocket, }: buildPythonPackage rec { @@ -39,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pycrdt-websocket websockets - ypy-websocket ]; # requires a Node.js environment @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/jupyter-server/jupyter_ydoc/blob/${src.tag}/CHANGELOG.md"; - description = "Document structures for collaborative editing using Ypy"; + description = "Document structures for collaborative editing using Yjs/pycrdt"; homepage = "https://github.com/jupyter-server/jupyter_ydoc"; license = lib.licenses.bsd3; teams = [ lib.teams.jupyter ]; diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix deleted file mode 100644 index 13cf2bbe3d17..000000000000 --- a/pkgs/development/python-modules/ypy-websocket/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - hatchling, - - # dependencies - aiosqlite, - anyio, - y-py, - - # testing - pytest-asyncio, - pytestCheckHook, - uvicorn, - websockets, -}: - -buildPythonPackage rec { - pname = "ypy-websocket"; - version = "0.12.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "y-crdt"; - repo = "ypy-websocket"; - tag = "v${version}"; - hash = "sha256-48x+MUhev9dErC003XOP3oGKd5uOghlBFgcR8Nm/0xs="; - }; - - build-system = [ hatchling ]; - - pythonRelaxDeps = [ "aiofiles" ]; - - dependencies = [ - aiosqlite - anyio - y-py - ]; - - pythonImportsCheck = [ "ypy_websocket" ]; - - __darwinAllowLocalNetworking = true; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - uvicorn - websockets - ]; - - disabledTestPaths = [ - # requires installing yjs Node.js module - "tests/test_ypy_yjs.py" - # Depends on no longer maintained ypy - "tests/test_asgi.py" - ]; - - meta = { - changelog = "https://github.com/y-crdt/ypy-websocket/blob/${src.rev}/CHANGELOG.md"; - description = "WebSocket Connector for Ypy"; - homepage = "https://github.com/y-crdt/ypy-websocket"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 756c28ec3492..f4b2d782230d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -538,6 +538,7 @@ mapAliases { xbox-webapi = throw "xbox-webapi was removed because Home Assistant switched to python-xbox"; # added 2025-12-03 XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29 Yapsy = throw "'Yapsy' has been renamed to/replaced by 'yapsy'"; # Converted to throw 2025-10-29 + ypy-websocket = throw "'ypy-websocket' has been removed as it was archived upstream; consider using 'pycrdt-websocket' instead"; # Added 2026-01-21 z3 = throw "'z3' has been renamed to/replaced by 'z3-solver'"; # Converted to throw 2025-10-29 zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2025-10-29 zc_lockfile = throw "'zc_lockfile' has been renamed to/replaced by 'zc-lockfile'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3240f13cb592..f077210e4f44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21052,8 +21052,6 @@ self: super: with self; { yoyo-migrations = callPackage ../development/python-modules/yoyo-migrations { }; - ypy-websocket = callPackage ../development/python-modules/ypy-websocket { }; - yq = callPackage ../development/python-modules/yq { inherit (pkgs) jq; }; yt-dlp = toPythonModule (pkgs.yt-dlp.override { python3Packages = self; }); From 09f253e365fb8f5edf96a255701a2db878aeb6c5 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Wed, 21 Jan 2026 17:46:33 +0100 Subject: [PATCH 2/2] python3Packages.y-py: drop This package was archived upstream [1]. [1] https://github.com/y-crdt/ypy --- .../python-modules/pycrdt/default.nix | 2 - .../python-modules/y-py/default.nix | 48 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/python-modules/y-py/default.nix diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 34c0484ee440..da505140c3e4 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -12,7 +12,6 @@ pydantic, pytestCheckHook, trio, - y-py, nix-update-script, }: @@ -50,7 +49,6 @@ buildPythonPackage rec { pydantic pytestCheckHook trio - y-py ]; pytestFlags = [ diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix deleted file mode 100644 index 872ec058b9cf..000000000000 --- a/pkgs/development/python-modules/y-py/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchPypi, - rustPlatform, - cargo, - rustc, - libiconv, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "y-py"; - version = "0.6.2"; - pyproject = true; - - src = fetchPypi { - pname = "y_py"; - inherit version; - hash = "sha256-R1eoKlBAags6MzqgEiAZozG9bxbkn+1n3KQj+Siz/U0="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-Wh25tLOVhAYFLqjOrKSu4klB1hGSOMconC1xZG31Dbw="; - }; - - nativeBuildInputs = [ - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - cargo - rustc - ]; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; - - pythonImportsCheck = [ "y_py" ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - meta = { - description = "Python bindings for Y-CRDT"; - homepage = "https://github.com/y-crdt/ypy"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f4b2d782230d..76cc374d42c7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -537,6 +537,7 @@ mapAliases { xapp = throw "'xapp' has been renamed to/replaced by 'python-xapp'"; # Converted to throw 2025-10-29 xbox-webapi = throw "xbox-webapi was removed because Home Assistant switched to python-xbox"; # added 2025-12-03 XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29 + y-py = throw "'y-py' has been removed as it was archived upstream; consider using 'pycrdt' instead"; # Added 2026-01-21 Yapsy = throw "'Yapsy' has been renamed to/replaced by 'yapsy'"; # Converted to throw 2025-10-29 ypy-websocket = throw "'ypy-websocket' has been removed as it was archived upstream; consider using 'pycrdt-websocket' instead"; # Added 2026-01-21 z3 = throw "'z3' has been renamed to/replaced by 'z3-solver'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f077210e4f44..9766076552d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20952,8 +20952,6 @@ self: super: with self; { xyzservices = callPackage ../development/python-modules/xyzservices { }; - y-py = callPackage ../development/python-modules/y-py { }; - yabadaba = callPackage ../development/python-modules/yabadaba { }; yacs = callPackage ../development/python-modules/yacs { };