From e4dc6cb94ab678fd87a4404a0cacbac65e4c53ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:07:27 +0100 Subject: [PATCH 1/5] python310Packages.python-engineio: add changelog to meta --- pkgs/development/python-modules/python-engineio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index c9b344e5acf9..a23de9c8d70c 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; + hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; checkInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-engineio/"; + changelog = "https://github.com/miguelgrinberg/python-engineio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; From 24c01b4df59ae6d557911138bd63d82b97a64fe0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:10:51 +0100 Subject: [PATCH 2/5] python310Packages.python-socketio: add changelog to meta --- pkgs/development/python-modules/python-socketio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index a6b2bc0d247a..980e62428aff 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; + hash = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; }; propagatedBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-socketio/"; + changelog = "https://github.com/miguelgrinberg/python-socketio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; From fba6c4a986e73eedcfc247bc4fdc1ff9ee5e5999 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:13:32 +0100 Subject: [PATCH 3/5] python310Packages.python-socketio: 5.7.1 -> 5.7.2 Diff: https://github.com/miguelgrinberg/python-socketio/compare/v5.7.1...v5.7.2 Changelog: https://github.com/miguelgrinberg/python-socketio/blob/v5.7.2/CHANGES.md --- .../python-modules/python-socketio/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 980e62428aff..99cbce9ae1c3 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,17 +23,24 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - hash = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; + hash = "sha256-mSFs/k+3Lp5w4WdOLKj65kOA5b+Nc1uuksVmeeqV58E="; }; propagatedBuildInputs = [ - aiohttp bidict python-engineio - requests - websocket-client ]; + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; + }; + checkInputs = [ mock msgpack From 9c8472b021cb2018a0790d2b98d557d217276531 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:24:52 +0100 Subject: [PATCH 4/5] python310Packages.ripe-atlas-cousteau: add changelog to meta --- .../ripe-atlas-cousteau/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 6d3c9d5e397d..730560a00821 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -1,24 +1,27 @@ { lib -, python-dateutil -, python-socketio -, requests -, jsonschema -, pythonOlder -, pytestCheckHook , buildPythonPackage , fetchFromGitHub +, jsonschema +, pytestCheckHook +, python-dateutil +, python-socketio +, pythonOlder +, requests }: buildPythonPackage rec { pname = "ripe-atlas-cousteau"; version = "1.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; + hash = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; }; postPatch = '' @@ -44,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for RIPE ATLAS API"; homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau"; + changelog = "https://github.com/RIPE-NCC/ripe-atlas-cousteau/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ raitobezarius ]; }; From 38ddf5a423de63c14b9816bc6a28c055d908edbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:26:34 +0100 Subject: [PATCH 5/5] python310Packages.ripe-atlas-cousteau: adjust python-socketio input --- pkgs/development/python-modules/ripe-atlas-cousteau/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 730560a00821..34b22109d8e4 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { python-dateutil requests python-socketio - ]; + ] ++ python-socketio.optional-dependencies.client; checkInputs = [ pytestCheckHook