From 197d613ff8340ce9730803cfff5caad8b2079d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 14 Dec 2024 14:52:01 -0800
Subject: [PATCH 1/2] python311Packages.approvaltests: 14.0.0 -> 14.3.0

Diff: https://github.com/approvals/ApprovalTests.Python/compare/refs/tags/v14.0.0...v14.3.0

Changelog: https://github.com/approvals/ApprovalTests.Python/releases/tag/v14.1.0
           https://github.com/approvals/ApprovalTests.Python/releases/tag/v14.2.0
           https://github.com/approvals/ApprovalTests.Python/releases/tag/v14.3.0
---
 pkgs/development/python-modules/approvaltests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix
index 2b3ed4f45c196..9f175dbd1a604 100644
--- a/pkgs/development/python-modules/approvaltests/default.nix
+++ b/pkgs/development/python-modules/approvaltests/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "approvaltests";
-  version = "14.0.0";
+  version = "14.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "approvals";
     repo = "ApprovalTests.Python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BTTmmtmFjYBfzbVf/Fi8PwnpVJBcOOBTdFBmGowGez4=";
+    hash = "sha256-HcF4SjAdAPxINB0+kI1RWtKQ3VBhMNpFk6BECup7E+w=";
   };
 
   build-system = [ setuptools ];

From b07befddc3348b441d79db69ab22c7bac50b3772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 14 Dec 2024 14:58:02 -0800
Subject: [PATCH 2/2] python312Packages.mrjob: unbreak

---
 .../python-modules/mrjob/default.nix            | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix
index 35af2272ff586..7e84de8bc8660 100644
--- a/pkgs/development/python-modules/mrjob/default.nix
+++ b/pkgs/development/python-modules/mrjob/default.nix
@@ -4,7 +4,11 @@
   pythonAtLeast,
   fetchFromGitHub,
 
+  # build-system
+  setuptools,
+
   # propagates
+  distutils,
   pyyaml,
 
   # optionals
@@ -26,9 +30,7 @@
 buildPythonPackage rec {
   pname = "mrjob";
   version = "0.7.4";
-
-  # https://github.com/Yelp/mrjob/issues/2222
-  disabled = pythonAtLeast "3.12";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Yelp";
@@ -37,7 +39,14 @@ buildPythonPackage rec {
     hash = "sha256-Yp4yUx6tkyGB622I9y+AWK2AkIDVGKQPMM+LtB/M3uo=";
   };
 
-  propagatedBuildInputs = [ pyyaml ];
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    distutils
+    pyyaml
+  ];
 
   optional-dependencies = {
     aws = [