From 55e5ed8ba05bc6cff0919abc01100dca300ab907 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 29 Mar 2025 11:51:34 +0100
Subject: [PATCH] python313Packages.python-jose: 3.3.0 -> 3.4.0

Diff: https://github.com/mpdavis/python-jose/compare/refs/tags/3.3.0...3.4.0

Changelog: https://github.com/mpdavis/python-jose/releases/tag/3.4.0
---
 .../python-modules/python-jose/default.nix    | 61 ++++++-------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 037b352ccc7e..1c1302f803c3 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -1,59 +1,37 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-
-  # build-system
-  setuptools,
-
-  # dependencies
-  ecdsa,
-  rsa,
-  pyasn1,
-
-  # optional-dependencies
   cryptography,
+  ecdsa,
+  fetchFromGitHub,
+  pyasn1,
   pycrypto,
   pycryptodome,
-
-  # tests
   pytestCheckHook,
+  rsa,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-jose";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mpdavis";
-    repo = pname;
-    rev = version;
-    hash = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM=";
+    repo = "python-jose";
+    tag = version;
+    hash = "sha256-rPtOZ25aKIN+g3cyv8n6cNejoj3yKk4zpjdLDyEG1e4=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2024-33663.patch";
-      url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-python-jose/CVE-2024-33663.patch?rev=36cd8815411620042f56a3b81599b341";
-      hash = "sha256-uxOCa7Lg82zY2nuHzw6CbcymCKUodITrFU3lLY1XMFU=";
-    })
-    (fetchpatch {
-      name = "CVE-2024-33664.patch";
-      url = "https://build.opensuse.org/public/source/openSUSE:Factory/python-python-jose/CVE-2024-33664.patch?rev=36cd8815411620042f56a3b81599b341";
-      hash = "sha256-wx/U1T7t7TloP+dMXxGxEVB3bMC7e6epmN8RE8FKksM=";
-    })
+  pythonRelaxDeps = [
+    # https://github.com/mpdavis/python-jose/pull/376
+    "pyasn1"
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pytest-runner",' ""
-  '';
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     ecdsa
     pyasn1
     rsa
@@ -65,21 +43,16 @@ buildPythonPackage rec {
     pycryptodome = [ pycryptodome ];
   };
 
-  pythonImportsCheck = [ "jose" ];
-
   nativeCheckInputs = [
     pytestCheckHook
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests = [
-    # https://github.com/mpdavis/python-jose/issues/348
-    "TestBackendEcdsaCompatibility"
-  ];
+  pythonImportsCheck = [ "jose" ];
 
   meta = with lib; {
-    changelog = "https://github.com/mpdavis/python-jose/releases/tag/${version}";
-    homepage = "https://github.com/mpdavis/python-jose";
     description = "JOSE implementation in Python";
+    homepage = "https://github.com/mpdavis/python-jose";
+    changelog = "https://github.com/mpdavis/python-jose/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = [ ];
   };