From f267cdf4a1049250190f9bb7fb8eaff1a8837b25 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 18 Mar 2024 16:33:39 +0100
Subject: [PATCH 01/20] python312Packages.azure-keyvault-keys: 4.8.0 -> 4.9.0

Changelog: https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_4.9.0/sdk/keyvault/azure-keyvault-keys
---
 .../azure-keyvault-keys/default.nix           | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 7c2bef4a0844..807a40e2c883 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -1,45 +1,44 @@
 { lib
-, buildPythonPackage
-, pythonOlder
-, fetchPypi
-, aiohttp
 , azure-common
 , azure-core
+, buildPythonPackage
 , cryptography
-, msrest
-, pytestCheckHook
+, fetchPypi
+, isodate
+, pythonOlder
+, setuptools
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "azure-keyvault-keys";
-  version = "4.8.0";
-  format = "setuptools";
+  version = "4.9.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    hash = "sha256-bAuy94MgKjSj5ex0hm5iEuWRrHEk8DuWadGwm2giS8Q=";
+    hash = "sha256-CGMtzW7OKGVyBOmiVq1kNp/isOOF7UM0n5MvAH2J93Q=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   propagatedBuildInputs = [
     azure-common
     azure-core
-    msrest
     cryptography
-  ];
-
-  nativeCheckInputs = [
-    aiohttp
-    pytestCheckHook
+    isodate
+    typing-extensions
   ];
 
   pythonNamespaces = [
     "azure.keyvault"
   ];
 
-  # requires relative paths to utilities in the mono-repo
+  # Tests require relative paths to utilities in the mono-repo
   doCheck = false;
 
   pythonImportsCheck = [
@@ -52,7 +51,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Microsoft Azure Key Vault Keys Client Library for Python";
-    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_${version}/sdk/keyvault/azure-keyvault-keys";
     license = licenses.mit;
     maintainers = with maintainers; [ jonringer ];
   };

From 6dd0f5dfc30120724f7d0e74916bb29d743ca8b3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 12:47:51 +0200
Subject: [PATCH 02/20] python312Packages.azure-keyvault-keys: refactor

---
 .../python-modules/azure-keyvault-keys/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 807a40e2c883..c5ac43c82e1e 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -22,11 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-CGMtzW7OKGVyBOmiVq1kNp/isOOF7UM0n5MvAH2J93Q=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     azure-common
     azure-core
     cryptography

From d1a9f32eac6ebadc25afb84d3382c1c6edfbd7b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 12:48:12 +0200
Subject: [PATCH 03/20] python312Packages.azure-keyvault-keys: foramt with
 nixfmt

---
 .../azure-keyvault-keys/default.nix           | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index c5ac43c82e1e..79b13b55ea91 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -1,13 +1,14 @@
-{ lib
-, azure-common
-, azure-core
-, buildPythonPackage
-, cryptography
-, fetchPypi
-, isodate
-, pythonOlder
-, setuptools
-, typing-extensions
+{
+  lib,
+  azure-common,
+  azure-core,
+  buildPythonPackage,
+  cryptography,
+  fetchPypi,
+  isodate,
+  pythonOlder,
+  setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -22,9 +23,7 @@ buildPythonPackage rec {
     hash = "sha256-CGMtzW7OKGVyBOmiVq1kNp/isOOF7UM0n5MvAH2J93Q=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     azure-common
@@ -34,9 +33,7 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  pythonNamespaces = [
-    "azure.keyvault"
-  ];
+  pythonNamespaces = [ "azure.keyvault" ];
 
   # Tests require relative paths to utilities in the mono-repo
   doCheck = false;

From 6702cf1f7379f02ef1426a5861ed903a66e0ccca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 12:50:23 +0200
Subject: [PATCH 04/20] python311Packages.ed25519: format with nixfmt

---
 pkgs/development/python-modules/ed25519/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 745c2c38cd0d..1e59c7a16361 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -1,4 +1,9 @@
-{ lib, fetchPypi, buildPythonPackage, pythonAtLeast }:
+{
+  lib,
+  fetchPypi,
+  buildPythonPackage,
+  pythonAtLeast,
+}:
 
 buildPythonPackage rec {
   pname = "ed25519";

From 0d67a0d2f63f74b989e2347b1f3ef9130d9e2409 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 13:33:42 +0200
Subject: [PATCH 05/20] python312Packages.ed25519: refactor

- add pythonImportsCheck
- add changelog to meta
- remove vendorized versioneer.py
---
 .../python-modules/ed25519/default.nix        | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
index 1e59c7a16361..80e405313cbc 100644
--- a/pkgs/development/python-modules/ed25519/default.nix
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -1,27 +1,45 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
-  pythonAtLeast,
+  fetchFromGitHub,
+  fetchpatch,
+  pythonOlder,
+  setuptools,
+  versioneer,
 }:
 
 buildPythonPackage rec {
   pname = "ed25519";
   version = "1.5";
-  format = "setuptools";
+  pyproject = true;
 
-  # last commit in 2019, various compat issues with 3.12
-  disabled = pythonAtLeast "3.12";
+  disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182";
+  src = fetchFromGitHub {
+    owner = "warner";
+    repo = "python-ed25519";
+    rev = "refs/tags/${version}";
+    hash = "sha256-AwnhB5UGycQliNndbqd0JlI4vKSehCSy0qHv2EiB+jA=";
   };
 
+  postPatch = ''
+    rm versioneer.py
+  '';
+
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  pythonImportsCheck = [
+    "ed25519"
+  ];
+
   meta = with lib; {
     description = "Ed25519 public-key signatures";
     mainProgram = "edsig";
     homepage = "https://github.com/warner/python-ed25519";
+    changelog = "https://github.com/warner/python-ed25519/blob/${version}/NEWS";
     license = licenses.mit;
     maintainers = with maintainers; [ np ];
   };

From a6a45ac1575bd42bcad685eab56933ac07c47432 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:27:48 +0200
Subject: [PATCH 06/20] python311Packages.securesystemslib: format with nixfmt

---
 .../securesystemslib/default.nix              | 58 ++++++++-----------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix
index ccc89a290035..21cff0dc498e 100644
--- a/pkgs/development/python-modules/securesystemslib/default.nix
+++ b/pkgs/development/python-modules/securesystemslib/default.nix
@@ -1,19 +1,20 @@
-{ lib
-, asn1crypto
-, azure-identity
-, azure-keyvault-keys
-, boto3
-, botocore
-, buildPythonPackage
-, cryptography
-, ed25519
-, fetchFromGitHub
-, google-cloud-kms
-, hatchling
-, pynacl
-, pyspx
-, pytestCheckHook
-, pythonOlder
+{
+  lib,
+  asn1crypto,
+  azure-identity,
+  azure-keyvault-keys,
+  boto3,
+  botocore,
+  buildPythonPackage,
+  cryptography,
+  ed25519,
+  fetchFromGitHub,
+  google-cloud-kms,
+  hatchling,
+  pynacl,
+  pyspx,
+  pytestCheckHook,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -32,17 +33,13 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "hatchling==1.18.0" "hatchling"
+      --replace-fail "hatchling==1.18.0" "hatchling"
   '';
 
-  nativeBuildInputs = [
-    hatchling
-  ];
+  nativeBuildInputs = [ hatchling ];
 
   passthru.optional-dependencies = {
-    PySPX = [
-      pyspx
-    ];
+    PySPX = [ pyspx ];
     awskms = [
       boto3
       botocore
@@ -53,9 +50,7 @@ buildPythonPackage rec {
       azure-keyvault-keys
       cryptography
     ];
-    crypto = [
-      cryptography
-    ];
+    crypto = [ cryptography ];
     gcpkms = [
       cryptography
       google-cloud-kms
@@ -63,11 +58,9 @@ buildPythonPackage rec {
     hsm = [
       asn1crypto
       cryptography
-    #   pykcs11
-    ];
-    pynacl = [
-      pynacl
+      #   pykcs11
     ];
+    pynacl = [ pynacl ];
     # Circular dependency
     # sigstore = [
     #   sigstore
@@ -79,9 +72,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
-  pythonImportsCheck = [
-    "securesystemslib"
-  ];
+  pythonImportsCheck = [ "securesystemslib" ];
 
   disabledTestPaths = [
     # pykcs11 is not available
@@ -98,4 +89,3 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ fab ];
   };
 }
-

From 54dfe6624be6de7a9641cdff7f5fca9b67638a83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:31:43 +0200
Subject: [PATCH 07/20] python312Packages.grpclib: refactor

---
 .../python-modules/grpclib/default.nix        | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index be31ef9c78c0..9e39bd0da58a 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -1,33 +1,37 @@
-{ buildPythonPackage
+{ lib
+, async-timeout
+, buildPythonPackage
+, certifi
+, faker
 , fetchFromGitHub
-, lib
-, pythonOlder
+, googleapis-common-protos
 , h2
 , multidict
-, pytestCheckHook
 , pytest-asyncio
-, async-timeout
-, faker
-, googleapis-common-protos
-, certifi
+, pytestCheckHook
+, pythonOlder
+, setuptools
 }:
-let
+
+buildPythonPackage rec {
   pname = "grpclib";
   version = "0.4.4";
-  format = "setuptools";
-in
-buildPythonPackage {
-  inherit pname version;
+  pyproject = true;
+
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "vmagamedov";
-    repo = pname;
-    rev = "v${version}";
+    repo = "grpclib";
+    rev = "refs/tags/v${version}";
     hash = "sha256-bCLyBfsNdIGdpz9l/r2iYIQ5TitKmsctekeOthIkXhw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     h2
     multidict
   ];
@@ -46,6 +50,7 @@ buildPythonPackage {
   meta = with lib; {
     description = "Pure-Python gRPC implementation for asyncio";
     homepage = "https://github.com/vmagamedov/grpclib";
+    changelog = "https://github.com/vmagamedov/grpclib/blob/v${version}/docs/changelog/index.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ nikstur ];
   };

From b4e8b0ff296eaf74e50657febf715013b44aa84a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:32:17 +0200
Subject: [PATCH 08/20] python312Packages.grpclib: format with nixfmt

---
 .../python-modules/grpclib/default.nix        | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index 9e39bd0da58a..b60c1c83fb97 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -1,16 +1,17 @@
-{ lib
-, async-timeout
-, buildPythonPackage
-, certifi
-, faker
-, fetchFromGitHub
-, googleapis-common-protos
-, h2
-, multidict
-, pytest-asyncio
-, pytestCheckHook
-, pythonOlder
-, setuptools
+{
+  lib,
+  async-timeout,
+  buildPythonPackage,
+  certifi,
+  faker,
+  fetchFromGitHub,
+  googleapis-common-protos,
+  h2,
+  multidict,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -27,9 +28,7 @@ buildPythonPackage rec {
     hash = "sha256-bCLyBfsNdIGdpz9l/r2iYIQ5TitKmsctekeOthIkXhw=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     h2

From 2a95659c3804ae27d6fb475b178ba83e4014d23c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:32:53 +0200
Subject: [PATCH 09/20] python312Packages.grpclib: 0.4.4 -> 0.4.7

Diff: https://github.com/vmagamedov/grpclib/compare/refs/tags/v0.4.4...v0.4.7

Changelog: https://github.com/vmagamedov/grpclib/blob/v0.4.7/docs/changelog/index.rst
---
 pkgs/development/python-modules/grpclib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index b60c1c83fb97..d88500f6a296 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "grpclib";
-  version = "0.4.4";
+  version = "0.4.7";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "vmagamedov";
     repo = "grpclib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bCLyBfsNdIGdpz9l/r2iYIQ5TitKmsctekeOthIkXhw=";
+    hash = "sha256-5221hVjD0TynCsTdruiUZkTsb7uOi49tZ8M/YqdWreE=";
   };
 
   build-system = [ setuptools ];

From 6568eccf17c4d3b8b078f6acf34675fb42e8939f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:37:16 +0200
Subject: [PATCH 10/20] python312Packages.betterproto: format with nixfmt

---
 .../python-modules/betterproto/default.nix    | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index e1d9f75a9a90..a35b24999230 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -1,21 +1,22 @@
-{ buildPythonPackage
-, fetchFromGitHub
-, lib
-, pythonOlder
-, poetry-core
-, grpclib
-, python-dateutil
-, black
-, jinja2
-, isort
-, python
-, pydantic
-, pytestCheckHook
-, pytest-asyncio
-, pytest-mock
-, typing-extensions
-, tomlkit
-, grpcio-tools
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pythonOlder,
+  poetry-core,
+  grpclib,
+  python-dateutil,
+  black,
+  jinja2,
+  isort,
+  python,
+  pydantic,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-mock,
+  typing-extensions,
+  tomlkit,
+  grpcio-tools,
 }:
 
 buildPythonPackage rec {
@@ -32,9 +33,7 @@ buildPythonPackage rec {
     hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
   };
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
+  nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
     grpclib
@@ -57,9 +56,7 @@ buildPythonPackage rec {
     tomlkit
   ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
-  pythonImportsCheck = [
-    "betterproto"
-  ];
+  pythonImportsCheck = [ "betterproto" ];
 
   # The tests require the generation of code before execution. This requires
   # the protoc-gen-python_betterproto script from the package to be on PATH.
@@ -74,9 +71,7 @@ buildPythonPackage rec {
     "tests/inputs/oneof/test_oneof.py"
   ];
 
-  disabledTests = [
-    "test_pydantic_no_value"
-  ];
+  disabledTests = [ "test_pydantic_no_value" ];
 
   meta = with lib; {
     description = "Code generator & library for Protobuf 3 and async gRPC";

From ed71d169badcb759a041f7016512f9a4d263fd2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:47:53 +0200
Subject: [PATCH 11/20] python312Packages.betterproto: disable flaky test

---
 pkgs/development/python-modules/betterproto/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index a35b24999230..28e810b74292 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -71,7 +71,11 @@ buildPythonPackage rec {
     "tests/inputs/oneof/test_oneof.py"
   ];
 
-  disabledTests = [ "test_pydantic_no_value" ];
+  disabledTests = [
+    "test_pydantic_no_value"
+    # Test is flaky
+    "test_binary_compatibility"
+  ];
 
   meta = with lib; {
     description = "Code generator & library for Protobuf 3 and async gRPC";

From 1c139576be6f5ec26e40d63e441686b867c3684d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 16:48:35 +0200
Subject: [PATCH 12/20] python312Packages.betterproto: refactor

---
 pkgs/development/python-modules/betterproto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index 28e810b74292..c3a823169d46 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -33,9 +33,9 @@ buildPythonPackage rec {
     hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     grpclib
     python-dateutil
     typing-extensions

From 1a65ceb3d17b52630634b1c3e8f3a3ea1d825600 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 17:11:58 +0200
Subject: [PATCH 13/20] python311Packages.sigstore: refactor

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

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 144b1daac21c..8e592a898931 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -34,11 +34,11 @@ buildPythonPackage rec {
     hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     flit-core
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     appdirs
     cryptography
     id
@@ -82,10 +82,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A codesigning tool for Python packages";
-    mainProgram = "sigstore";
     homepage = "https://github.com/sigstore/sigstore-python";
     changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
+    mainProgram = "sigstore";
   };
 }

From 63d75f2617fdfb0c63e8c1e9d55ead863554727e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 17:22:10 +0200
Subject: [PATCH 14/20] Revert "python3Packages.sigstore-rekor-types: 0.0.11 ->
 0.0.12"

This reverts commit 836157ed90c0b50bae7a4a3ef6de99423262622f.
---
 .../python-modules/sigstore-rekor-types/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
index b7d96f9ed10e..a58595ed19a9 100644
--- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix
+++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "sigstore-rekor-types";
-  version = "0.0.12";
+  version = "0.0.11";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "trailofbits";
     repo = "sigstore-rekor-types";
     rev = "refs/tags/v${version}";
-    hash = "sha256-B6u2YbtZtgjYJoWL2DfgP7LL20onNaaTTFbC6JIA4bE=";
+    hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns=";
   };
 
   nativeBuildInputs = [

From 428f5e5ae78fa0a79967a88d6aa0359cd3ecffca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 17:24:20 +0200
Subject: [PATCH 15/20] python312Packages.sigstore-rekor-types: refactor

---
 .../sigstore-rekor-types/default.nix          | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
index a58595ed19a9..7498a29ee104 100644
--- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix
+++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
@@ -1,9 +1,10 @@
-{ lib
-, pythonOlder
-, pydantic
-, flit-core
-, fetchFromGitHub
-, buildPythonPackage
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  flit-core,
+  pydantic,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -20,13 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-oOFdRiDp9USc3A+aaPExprEO2i/RERNahiyi2kVpkns=";
   };
 
-  nativeBuildInputs = [
-    flit-core
-  ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
-    pydantic
-  ] ++ pydantic.optional-dependencies.email;
+  dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email;
 
   # Module has no tests
   doCheck = false;

From c59ceae809fbdfc67b0db58b0fb661f3cbafe55c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 17:26:20 +0200
Subject: [PATCH 16/20] python311Packages.sigstore: 2.1.0 -> 2.1.5

Diff: https://github.com/sigstore/sigstore-python/compare/refs/tags/v2.1.0...v2.1.5

Changelog: https://github.com/sigstore/sigstore-python/blob/2.1.5/CHANGELOG.md
---
 pkgs/development/python-modules/sigstore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 8e592a898931..0bdfb0e83af4 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -11,18 +11,18 @@
 , pyjwt
 , pyopenssl
 , pytestCheckHook
+, pythonOlder
 , requests
 , rich
 , securesystemslib
 , sigstore-protobuf-specs
 , sigstore-rekor-types
 , tuf
-, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "sigstore-python";
-  version = "2.1.0";
+  version = "2.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "sigstore";
     repo = "sigstore-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA=";
+    hash = "sha256-lqmrM4r1yPVCcvWNC9CKYMyryuIyliI2Y+TAYgAwA1Y=";
   };
 
   build-system = [

From 5d660042398435e5436fcc39857e7681b92d758a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 17:26:59 +0200
Subject: [PATCH 17/20] python311Packages.sigstore: format with nixfmt

---
 .../python-modules/sigstore/default.nix       | 49 +++++++++----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 0bdfb0e83af4..804e2fb69d89 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -1,23 +1,24 @@
-{ lib
-, appdirs
-, buildPythonPackage
-, cryptography
-, fetchFromGitHub
-, flit-core
-, id
-, importlib-resources
-, pretend
-, pydantic
-, pyjwt
-, pyopenssl
-, pytestCheckHook
-, pythonOlder
-, requests
-, rich
-, securesystemslib
-, sigstore-protobuf-specs
-, sigstore-rekor-types
-, tuf
+{
+  lib,
+  appdirs,
+  buildPythonPackage,
+  cryptography,
+  fetchFromGitHub,
+  flit-core,
+  id,
+  importlib-resources,
+  pretend,
+  pydantic,
+  pyjwt,
+  pyopenssl,
+  pytestCheckHook,
+  pythonOlder,
+  requests,
+  rich,
+  securesystemslib,
+  sigstore-protobuf-specs,
+  sigstore-rekor-types,
+  tuf,
 }:
 
 buildPythonPackage rec {
@@ -34,9 +35,7 @@ buildPythonPackage rec {
     hash = "sha256-lqmrM4r1yPVCcvWNC9CKYMyryuIyliI2Y+TAYgAwA1Y=";
   };
 
-  build-system = [
-    flit-core
-  ];
+  build-system = [ flit-core ];
 
   dependencies = [
     appdirs
@@ -63,9 +62,7 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  pythonImportsCheck = [
-    "sigstore"
-  ];
+  pythonImportsCheck = [ "sigstore" ];
 
   disabledTests = [
     # Tests require network access

From 77502bb56ecc6aec14dc2bc02fde1858ed08132b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 19:30:44 +0200
Subject: [PATCH 18/20] python311Packages.nats-py: format with nixfmt

---
 .../python-modules/nats-py/default.nix        | 67 +++++++++----------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 93cb33f9fd07..24c844550213 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -1,15 +1,16 @@
-{ lib
-, stdenv
-, aiohttp
-, buildPythonPackage
-, ed25519
-, fetchFromGitHub
-, nats-server
-, nkeys
-, pytestCheckHook
-, pythonOlder
-, setuptools
-, uvloop
+{
+  lib,
+  stdenv,
+  aiohttp,
+  buildPythonPackage,
+  ed25519,
+  fetchFromGitHub,
+  nats-server,
+  nkeys,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  uvloop,
 }:
 
 buildPythonPackage rec {
@@ -26,21 +27,13 @@ buildPythonPackage rec {
     hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs = [
-    ed25519
-  ];
+  propagatedBuildInputs = [ ed25519 ];
 
   passthru.optional-dependencies = {
-    aiohttp = [
-      aiohttp
-    ];
-    nkeys = [
-      nkeys
-    ];
+    aiohttp = [ aiohttp ];
+    nkeys = [ nkeys ];
     # fast_parse = [
     #   fast-mail-parser
     # ];
@@ -52,20 +45,20 @@ buildPythonPackage rec {
     uvloop
   ];
 
-  disabledTests = [
-    # AssertionError: assert 5 == 0
-    "test_pull_subscribe_limits"
-    "test_fetch_n"
-    "test_subscribe_no_echo"
-    "test_stream_management"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "test_subscribe_iterate_next_msg"
-    "test_buf_size_force_flush_timeout"
-  ];
+  disabledTests =
+    [
+      # AssertionError: assert 5 == 0
+      "test_pull_subscribe_limits"
+      "test_fetch_n"
+      "test_subscribe_no_echo"
+      "test_stream_management"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      "test_subscribe_iterate_next_msg"
+      "test_buf_size_force_flush_timeout"
+    ];
 
-  pythonImportsCheck = [
-    "nats"
-  ];
+  pythonImportsCheck = [ "nats" ];
 
   meta = with lib; {
     description = "Python client for NATS.io";

From b104cf86f277784cab0bd07301fdb4a29c28ee4a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 19:31:49 +0200
Subject: [PATCH 19/20] python311Packages.nats-py: refactor

---
 pkgs/development/python-modules/nats-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 24c844550213..5861f1c332a8 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -27,9 +27,9 @@ buildPythonPackage rec {
     hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ ed25519 ];
+  dependencies = [ ed25519 ];
 
   passthru.optional-dependencies = {
     aiohttp = [ aiohttp ];

From a5e78b356d063506061f84db1390a462a29d7811 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 16 Apr 2024 19:34:57 +0200
Subject: [PATCH 20/20] python311Packages.nats-py: disable failing tests

---
 pkgs/development/python-modules/nats-py/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 5861f1c332a8..7102d87286bb 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -52,6 +52,10 @@ buildPythonPackage rec {
       "test_fetch_n"
       "test_subscribe_no_echo"
       "test_stream_management"
+      # Tests fail on hydra, often Time-out
+      "test_subscribe_iterate_next_msg"
+      "test_ordered_consumer_larger_streams"
+      "test_object_file_basics"
     ]
     ++ lib.optionals stdenv.isDarwin [
       "test_subscribe_iterate_next_msg"