From bdc849902634099083bf40c35b63a97f0bcb5c1c Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Fri, 30 Jun 2023 23:51:43 -0700
Subject: [PATCH 1/2] python310Packages.jaraco_collections: 3.8.0 -> 4.3.0

---
 .../python-modules/jaraco_collections/default.nix        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
index e60da3771297..07cc11ec92e6 100644
--- a/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , setuptools-scm
 , jaraco_classes
 , jaraco_text
@@ -8,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "jaraco.collections";
-  version = "3.8.0";
+  version = "4.3.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA=";
+    hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ=";
   };
 
   postPatch = ''
@@ -22,9 +23,12 @@ buildPythonPackage rec {
   '';
 
   nativeBuildInputs = [
+    setuptools
     setuptools-scm
   ];
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   propagatedBuildInputs = [
     jaraco_classes
     jaraco_text
@@ -39,6 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Models and classes to supplement the stdlib 'collections' module";
     homepage = "https://github.com/jaraco/jaraco.collections";
+    changelog = "https://github.com/jaraco/jaraco.collections/blob/v${version}/NEWS.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
   };

From 1dfe3538084d22c01af0e8c7f13df38fc0006a86 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Fri, 30 Jun 2023 23:52:11 -0700
Subject: [PATCH 2/2] python310Packages.jaraco-email: patch to work with
 jaraco.collections 4+

---
 .../python-modules/jaraco-email/default.nix        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix
index b99eff746f47..6e036379b5ce 100644
--- a/pkgs/development/python-modules/jaraco-email/default.nix
+++ b/pkgs/development/python-modules/jaraco-email/default.nix
@@ -3,6 +3,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, fetchpatch
 , setuptools
 , setuptools-scm
 , jaraco_text
@@ -26,6 +27,19 @@ buildPythonPackage rec {
     hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "dos2unix-line-endings.patch";
+      url = "https://github.com/jaraco/jaraco.email/commit/ab9643598e26cca9c9cdbd34b00c972f547b9236.patch";
+      hash = "sha256-Z2WOnR+ELzQciVyUiUq4jaP+Vnc4aseLP7+LWJZoOU8=";
+    })
+    (fetchpatch {
+      name = "jaraco-collections-4-compatibility.patch";
+      url = "https://github.com/jaraco/jaraco.email/commit/e65e5fed0178ddcd009d16883b381c5582f1a9df.patch";
+      hash = "sha256-mKxa0ZU1JFeQPemrjQl94buLNY5gXnMCCRKBxdO870M=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
     setuptools-scm