From 76cd5ee9d23651f0456ab7772dece47c3b2317d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 19:19:37 +0100 Subject: [PATCH 1/2] python310Packages.websockify: add changelog to meta --- pkgs/development/python-modules/websockify/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index e1f311ba027b..58fc2f67d9c3 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -23,7 +23,8 @@ buildPythonPackage rec { meta = with lib; { description = "WebSockets support for any application/server"; homepage = "https://github.com/kanaka/websockify"; - license = licenses.lgpl3; + changelog = "https://github.com/novnc/websockify/releases/tag/v${version}"; + license = licenses.lgpl3Only; maintainers = with maintainers; [ ]; }; } From c9e5fa48c9afa3090f05d6407d3cbdaf50ac04a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 19:24:50 +0100 Subject: [PATCH 2/2] python310Packages.websockify: 0.10.0 -> 0.11.0 Diff: https://github.com/novnc/websockify/compare/refs/tags/v0.10.0...v0.11.0 Changelog: https://github.com/novnc/websockify/releases/tag/v0.11.0 --- .../python-modules/websockify/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 58fc2f67d9c3..8b0401b72fbe 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -1,24 +1,44 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, jwcrypto , numpy +, pytestCheckHook +, pythonOlder +, redis +, requests +, simplejson }: buildPythonPackage rec { - version = "0.10.0"; pname = "websockify"; + version = "0.11.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "novnc"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-82Fk9qbiiCD5Rts1d14sK/njeN7DcjKMKPqE7S/1WHs="; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + jwcrypto + numpy + redis + requests + simplejson + ]; - # Ran 0 tests in 0.000s - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "websockify" ]; + pythonImportsCheck = [ + "websockify" + ]; meta = with lib; { description = "WebSockets support for any application/server";