From ef0e4e67ccf4e4838d7eb8a5e42e0b511a15500c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 16 Mar 2023 22:42:24 +0100
Subject: [PATCH 1/2] python310Packages.json-stream-rs-tokenizer: 0.4.13 ->
 0.4.16

Diff: https://github.com/smheidrich/py-json-stream-rs-tokenizer/compare/refs/tags/v0.4.13...v0.4.16
---
 .../python-modules/json-stream-rs-tokenizer/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
index 21277a176dbc..1bcfe740952f 100644
--- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
+++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "json-stream-rs-tokenizer";
-  version = "0.4.13";
+  version = "0.4.16";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "smheidrich";
     repo = "py-json-stream-rs-tokenizer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9pJi80V7WKvsgtp0ffItWnjoOvFvfE/Sz6y2VlsU+wQ=";
+    hash = "sha256-MnYkCAI8x65kU0EoTRf4ZVsbjNravjokepX4yViu7go=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src postPatch;
     name = "${pname}-${version}";
-    hash = "sha256-TjRdHSXHmF6fzCshX1I4Sq+A/fEmBHDPGZvJUxL13aM=";
+    hash = "sha256-HwWH8/UWKWOdRmyCVQtNqJxXD55f6zxLY0LhR7JU9ro=";
   };
 
   nativeBuildInputs = [

From 20fe8b2871b3d53e3443d8e2a8f661fe0d46f3e9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Mar 2023 01:20:39 +0100
Subject: [PATCH 2/2] python310Packages.passlib: libxcrypt related failures
 also affect linux

---
 pkgs/development/python-modules/passlib/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index f18307c50bf0..c9592f5fc9cb 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -1,20 +1,23 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , argon2-cffi
 , bcrypt
 , cryptography
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "passlib";
   version = "1.7.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04";
+    hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ";
   };
 
   passthru.optional-dependencies = {
@@ -29,11 +32,14 @@ buildPythonPackage rec {
   ++ passthru.optional-dependencies.bcrypt
   ++ passthru.optional-dependencies.totp;
 
+  pythonImportsCheck = [
+    "passlib"
+  ];
+
   disabledTests = [
     # timming sensitive
     "test_dummy_verify"
     "test_encrypt_cost_timing"
-  ] ++ lib.optionals stdenv.isDarwin [
     # These tests fail because they don't expect support for algorithms provided through libxcrypt
     "test_82_crypt_support"
   ];