From efb6a85e389647cb79de44a2164d54c7bd4c37e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 9 Mar 2023 00:52:03 +0100
Subject: [PATCH 1/4] python310Packages.argcomplete: 2.0.0 -> 2.1.1

---
 .../python-modules/argcomplete/default.nix    | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 5bf20d82b2fe..12fd0fbd5a3e 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -1,30 +1,29 @@
-{ buildPythonPackage, fetchPypi, lib
-, dicttoxml
-, importlib-metadata
+{ buildPythonPackage
+, fetchPypi
+, lib
 , pexpect
-, prettytable
-, requests-toolbelt
 }:
+
 buildPythonPackage rec {
   pname = "argcomplete";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20";
+    sha256 = "sha256-cuCDQIUtMlREWcDBmq0bSKosOpbejG5XQkVrT1OMpS8=";
   };
 
-  doCheck = false; # meant to be ran with interactive interpreter
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"coverage",' "" \
+      --replace " + lint_require" ""
+  '';
 
-  # re-enable if we are able to make testing work
-  # nativeCheckInputs = [ bashInteractive coverage flake8 ];
+  # tries to build and install test packages which fails
+  doCheck = false;
 
   propagatedBuildInputs = [
-    dicttoxml
-    importlib-metadata
     pexpect
-    prettytable
-    requests-toolbelt
   ];
 
   pythonImportsCheck = [ "argcomplete" ];

From 6419b97e49a33301c60df2a9d750454b98f9008f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 11:20:16 +0100
Subject: [PATCH 2/4] commitizen: fix build after argcomplete update

---
 pkgs/applications/version-management/commitizen/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix
index 927bd7acaa94..ab15b09a4d18 100644
--- a/pkgs/applications/version-management/commitizen/default.nix
+++ b/pkgs/applications/version-management/commitizen/default.nix
@@ -1,4 +1,5 @@
 { buildPythonApplication
+, charset-normalizer
 , colorama
 , commitizen
 , decli
@@ -41,10 +42,12 @@ buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"'
+      --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \
+      --replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"'
   '';
 
   propagatedBuildInputs = [
+    charset-normalizer
     termcolor
     questionary
     colorama

From 957a7cbcc839d2463c1cee2f66fb7cb35bda2f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 11:31:05 +0100
Subject: [PATCH 3/4] python310Packages.can: add missing dependency, skip
 timing sensitive tests

---
 pkgs/development/python-modules/can/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index d96f588a0aae..d8937082cb69 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -10,6 +10,8 @@
 , pytest-timeout
 , pytestCheckHook
 , pythonOlder
+, setuptools
+, stdenv
 , typing-extensions
 , wrapt
 , uptime
@@ -37,6 +39,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     msgpack
     packaging
+    setuptools
     typing-extensions
     wrapt
   ];
@@ -73,10 +76,16 @@ buildPythonPackage rec {
     # pytest.approx is not supported in a boolean context (since pytest7)
     "test_pack_unpack"
     "test_receive"
+  ] ++ lib.optionals stdenv.isDarwin [
+    # timing sensitive
+    "test_general"
+    "test_gap"
   ];
 
   preCheck = ''
     export PATH="$PATH:$out/bin";
+    # skips timing senstive tests
+    export CI=1
   '';
 
   pythonImportsCheck = [

From 665daeee0012a9cc8219fb529c4d8a51d0bc3fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 13 Mar 2023 11:31:14 +0100
Subject: [PATCH 4/4] python310Packages.msgspec: fix src hash

---
 pkgs/development/python-modules/msgspec/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index 78aa7eb6e61e..10e0e6b23e8a 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "jcrist";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY=";
+    hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg=";
   };
 
   # Requires libasan to be accessible