From c3edbefe516ba2286f6b7598a1c0e0fed426f124 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jun 2025 17:23:43 +0200 Subject: [PATCH] python3Packages.python-jose: fix after bad merge The patch is contained in the 3.5.0 release, so it should have not been reapplied after the bump. --- .../python-jose/cryptography-45.0.patch | 55 ------------------- .../python-modules/python-jose/default.nix | 5 -- 2 files changed, 60 deletions(-) delete mode 100644 pkgs/development/python-modules/python-jose/cryptography-45.0.patch diff --git a/pkgs/development/python-modules/python-jose/cryptography-45.0.patch b/pkgs/development/python-modules/python-jose/cryptography-45.0.patch deleted file mode 100644 index af69e729c941..000000000000 --- a/pkgs/development/python-modules/python-jose/cryptography-45.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/jose/backends/__init__.py b/jose/backends/__init__.py -index e7bba69..9918969 100644 ---- a/jose/backends/__init__.py -+++ b/jose/backends/__init__.py -@@ -1,10 +1,4 @@ --try: -- from jose.backends.cryptography_backend import get_random_bytes # noqa: F401 --except ImportError: -- try: -- from jose.backends.pycrypto_backend import get_random_bytes # noqa: F401 -- except ImportError: -- from jose.backends.native import get_random_bytes # noqa: F401 -+from jose.backends.native import get_random_bytes # noqa: F401 - - try: - from jose.backends.cryptography_backend import CryptographyRSAKey as RSAKey # noqa: F401 -diff --git a/jose/backends/cryptography_backend.py b/jose/backends/cryptography_backend.py -index 1525cf2..3dce986 100644 ---- a/jose/backends/cryptography_backend.py -+++ b/jose/backends/cryptography_backend.py -@@ -26,33 +26,11 @@ from ..utils import ( - long_to_base64, - ) - from .base import Key -+from . import get_random_bytes - - _binding = None - - --def get_random_bytes(num_bytes): -- """ -- Get random bytes -- -- Currently, Cryptography returns OS random bytes. If you want OpenSSL -- generated random bytes, you'll have to switch the RAND engine after -- initializing the OpenSSL backend -- Args: -- num_bytes (int): Number of random bytes to generate and return -- Returns: -- bytes: Random bytes -- """ -- global _binding -- -- if _binding is None: -- _binding = Binding() -- -- buf = _binding.ffi.new("char[]", num_bytes) -- _binding.lib.RAND_bytes(buf, num_bytes) -- rand_bytes = _binding.ffi.buffer(buf, num_bytes)[:] -- return rand_bytes -- -- - class CryptographyECKey(Key): - SHA256 = hashes.SHA256 - SHA384 = hashes.SHA384 diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index a8fb2212cbec..e4300f33859b 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -24,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-8DQ0RBQ4ZgEIwcosgX3dzr928cYIQoH0obIOgk0+Ozs="; }; - patches = [ - # https://github.com/mpdavis/python-jose/pull/381 - ./cryptography-45.0.patch - ]; - pythonRelaxDeps = [ # https://github.com/mpdavis/python-jose/pull/376 "pyasn1"