From 3a252af5b61d992393b90943821f72248522eb10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Feb 2024 10:59:20 +0100 Subject: [PATCH 1/3] python311Packages.openaiauth: refactor --- pkgs/development/python-modules/openaiauth/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index da10f6ffbe55..58183ca1bdd6 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -3,12 +3,13 @@ , fetchPypi , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "openaiauth"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-9SrptiheiM5s9YI6Ht68ahDGMFADWfBQgAWUBY3EEJ8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; From 8fce2390579dceefa2710dfca72be7ccce082fe7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Feb 2024 11:00:02 +0100 Subject: [PATCH 2/3] python311Packages.tls-client: init at 1.0.1 Advanced HTTP Library https://github.com/FlorianREGAZ/Python-Tls-Client --- .../python-modules/tls-client/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/tls-client/default.nix diff --git a/pkgs/development/python-modules/tls-client/default.nix b/pkgs/development/python-modules/tls-client/default.nix new file mode 100644 index 000000000000..77e7a2f3e55c --- /dev/null +++ b/pkgs/development/python-modules/tls-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, typing-extensions +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tls-client"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "FlorianREGAZ"; + repo = "Python-Tls-Client"; + rev = "refs/tags/${version}"; + hash = "sha256-0eH9fA/oQzrgXcQilUdg4AaTqezj1Q9hP9olhZEDeBc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "tls_client" + ]; + + meta = with lib; { + description = "Advanced HTTP Library"; + homepage = "https://github.com/FlorianREGAZ/Python-Tls-Client"; + changelog = "https://github.com/FlorianREGAZ/Python-Tls-Client/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 317059621291..8fdf5a470091 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14585,6 +14585,8 @@ self: super: with self; { tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; + tls-client = callPackage ../development/python-modules/tls-client { }; + tls-parser = callPackage ../development/python-modules/tls-parser { }; tlv8 = callPackage ../development/python-modules/tlv8 { }; From e8373792a354204683da1960b4778e114c5f12a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Feb 2024 11:01:07 +0100 Subject: [PATCH 3/3] python311Packages.openaiauth: update input --- pkgs/development/python-modules/openaiauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index 58183ca1bdd6..1b33438e070f 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , pythonOlder -, requests , setuptools +, tls-client }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - requests + tls-client ]; # Module has no tests