From 03daded7fc8a08f6ad5c47e590da7caebb89a1c1 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 23:14:52 +0700 Subject: [PATCH 1/4] python3Packages.websockify: migrate to pyproject --- pkgs/development/python-modules/websockify/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 01aa8026ffb0..3d13556a178e 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + setuptools, jwcrypto, numpy, pytestCheckHook, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "websockify"; version = "0.13.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "novnc"; @@ -23,7 +24,9 @@ buildPythonPackage rec { hash = "sha256-b57L4o071zEt/gX9ZVzEpcnp0RCeo3peZrby2mccJgQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jwcrypto numpy redis From 5cd2dffea4bf32ed955508e96d925bee6dc85078 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 23:15:57 +0700 Subject: [PATCH 2/4] python3Packages.websockify: modernize --- pkgs/development/python-modules/websockify/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 3d13556a178e..0c7c67879aa6 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -12,15 +12,17 @@ simplejson, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "websockify"; version = "0.13.0"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "novnc"; repo = "websockify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-b57L4o071zEt/gX9ZVzEpcnp0RCeo3peZrby2mccJgQ="; }; @@ -48,8 +50,8 @@ buildPythonPackage rec { description = "WebSockets support for any application/server"; mainProgram = "websockify"; homepage = "https://github.com/kanaka/websockify"; - changelog = "https://github.com/novnc/websockify/releases/tag/${src.tag}"; + changelog = "https://github.com/novnc/websockify/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Only; maintainers = [ ]; }; -} +}) From ce08c9da2f6094594ce098c339cf84b678c5e230 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 23:17:09 +0700 Subject: [PATCH 3/4] python3Packages.websockify: fix meta.homepage URL --- pkgs/development/python-modules/websockify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 0c7c67879aa6..e0f4026c48ee 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "WebSockets support for any application/server"; mainProgram = "websockify"; - homepage = "https://github.com/kanaka/websockify"; + homepage = "https://github.com/novnc/websockify"; changelog = "https://github.com/novnc/websockify/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Only; maintainers = [ ]; From ff5f134a860d5fff82d2927bedea516482bd977e Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 16 Jun 2026 21:23:46 +0700 Subject: [PATCH 4/4] python3Packages.websockify: allow local networking on darwin --- pkgs/development/python-modules/websockify/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index e0f4026c48ee..b7f348fd9cf3 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -38,6 +38,8 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # this test failed on macos # https://github.com/novnc/websockify/issues/552