From 84e22224698fa0b52655b4d9153dcb8f0c0ee6f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 02:35:38 +0000 Subject: [PATCH 1/3] python312Packages.fastavro: 1.9.5 -> 1.9.7 --- pkgs/development/python-modules/fastavro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 06b86d13aaf1..f50bff2dc983 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.9.5"; + version = "1.9.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rw0kTSROCFthjo8SrLevBiACNaKpKWcZfIYoc89Q3eM="; + hash = "sha256-hKhwQqNJ+QvYf4x9FesNOPg36m8zC6D6dmlhANXCcsk="; }; preBuild = '' From 55a02840427ee93694ff501ef1005e26b7970c5b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Sep 2024 09:21:38 +0900 Subject: [PATCH 2/3] python312Packages.fastavro: switch to pypa build --- pkgs/development/python-modules/fastavro/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index f50bff2dc983..95e39762a11a 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -11,6 +11,7 @@ python-dateutil, python-snappy, pythonOlder, + setuptools, zlib-ng, zstandard, }: @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "fastavro"; version = "1.9.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -33,9 +34,12 @@ buildPythonPackage rec { export FASTAVRO_USE_CYTHON=1 ''; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; - passthru.optional-dependencies = { + optional-dependencies = { codecs = [ lz4 python-snappy @@ -52,7 +56,7 @@ buildPythonPackage rec { pytestCheckHook python-dateutil zlib-ng - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Fails with "AttributeError: module 'fastavro._read_py' has no attribute # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676. From cb1b6ee0051b1d27136b41620937a6e10306c672 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 7 Sep 2024 09:23:02 +0900 Subject: [PATCH 3/3] python312Packages.fastavro: replace python-snappy with cramjam --- pkgs/development/python-modules/fastavro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 95e39762a11a..16ede5ab211e 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -9,7 +9,7 @@ pandas, pytestCheckHook, python-dateutil, - python-snappy, + cramjam, pythonOlder, setuptools, zlib-ng, @@ -41,11 +41,11 @@ buildPythonPackage rec { optional-dependencies = { codecs = [ + cramjam lz4 - python-snappy zstandard ]; - snappy = [ python-snappy ]; + snappy = [ cramjam ]; zstandard = [ zstandard ]; lz4 = [ lz4 ]; };