Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

1 files changed, 31 insertions, 15 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/bytewax/default.nix b/nixpkgs/pkgs/development/python-modules/bytewax/default.nix
index e975dc32aee8..61e6b3142fb9 100644
--- a/nixpkgs/pkgs/development/python-modules/bytewax/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bytewax/default.nix
@@ -1,41 +1,47 @@
 { lib
 , stdenv
 , buildPythonPackage
+, cmake
+, confluent-kafka
+, cyrus_sasl
 , fetchFromGitHub
-, rustPlatform
-, setuptools-rust
 , openssl
 , pkg-config
-, cyrus_sasl
 , protobuf
-, cmake
-, gcc
-, confluent-kafka
 , pytestCheckHook
-, pythonAtLeast
+, pythonOlder
+, rustPlatform
+, setuptools-rust
 }:
 
 buildPythonPackage rec {
   pname = "bytewax";
-  version = "0.16.0";
+  version = "0.16.2";
   format = "pyproject";
 
-  disabled = pythonAtLeast "3.11";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "bytewax";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-XdFkFhN8Z15Zw5HZ2wmnNFoTzyRtIbB7TAtOpKwuKyY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-PHjKEZMNhtLliOSGt4XHQFDm8Rc4TejQUVSqFN6Au38=";
+  };
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
   };
 
   # Remove docs tests, myst-docutils in nixpkgs is not compatible with package requirements.
   # Package uses old version.
   patches = [ ./remove-docs-test.patch ];
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    hash = "sha256-XGE1qPHi13/+8jjNCIgfzPudw561T0vUfJv5xnKySAg=";
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "columnation-0.1.0" = "sha256-RAyZKR+sRmeWGh7QYPZnJgX9AtWqmca85HcABEFUgX8=";
+      "timely-0.12.0" = "sha256-sZuVLBDCXurIe38m4UAjEuFeh73VQ5Jawy+sr3U/HbI=";
+    };
   };
 
   nativeBuildInputs = [
@@ -53,18 +59,28 @@ buildPythonPackage rec {
     protobuf
   ];
 
+  passthru.optional-dependencies = {
+    kafka = [
+      confluent-kafka
+    ];
+  };
+
   preCheck = ''
     export PY_IGNORE_IMPORTMISMATCH=1
   '';
 
   checkInputs = [
     pytestCheckHook
-    confluent-kafka
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+  pythonImportsCheck = [
+    "bytewax"
   ];
 
   meta = with lib; {
     description = "Python Stream Processing";
     homepage = "https://github.com/bytewax/bytewax";
+    changelog = "https://github.com/bytewax/bytewax/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ mslingsby kfollesdal ];
     # mismatched type expected u8, found i8