From 550267174faf001f3dce24b90de44185adeee879 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 10:39:53 +0300 Subject: [PATCH 1/6] python311Packages.numcodecs: order inputs & no with lib; in meta --- .../python-modules/numcodecs/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index b789d8dabeeb..c3e61e67be6e 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,17 +2,23 @@ lib, stdenv, buildPythonPackage, - fetchpatch, fetchPypi, + fetchpatch, + python, + pythonOlder, + + # build-system setuptools, setuptools-scm, cython, - numpy, - msgpack, py-cpuinfo, + + # dependencies + numpy, + + # tests + msgpack, pytestCheckHook, - python, - pythonOlder, }: buildPythonPackage rec { @@ -54,6 +60,7 @@ buildPythonPackage rec { msgpack ]; + # https://github.com/NixOS/nixpkgs/issues/255262 pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ]; disabledTests = [ @@ -68,9 +75,9 @@ buildPythonPackage rec { "test_non_numpy_inputs" ]; - meta = with lib; { + meta = { homepage = "https://github.com/zarr-developers/numcodecs"; - license = licenses.mit; + license = lib.licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; maintainers = [ ]; }; From d7fb5d0185c012a240c2400d2713b78da55a897f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 10:43:42 +0300 Subject: [PATCH 2/6] python311Packages.numcodecs: simplify DISABLE_NUMCODECS_AVX2 --- pkgs/development/python-modules/numcodecs/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index c3e61e67be6e..253dfbeef572 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -47,13 +47,9 @@ buildPythonPackage rec { # zfpy = [ zfpy ]; }; - preBuild = - if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then - '' - export DISABLE_NUMCODECS_AVX2= - '' - else - null; + preBuild = lib.optionalString (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) '' + export DISABLE_NUMCODECS_AVX2=1 + ''; nativeCheckInputs = [ pytestCheckHook From 3438b4f44c10d277355e55ab021cba0144a5f0bc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 10:44:34 +0300 Subject: [PATCH 3/6] python311Packages.numcodecs: adopt --- pkgs/development/python-modules/numcodecs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 253dfbeef572..5aa8130c73ea 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { homepage = "https://github.com/zarr-developers/numcodecs"; license = lib.licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } From a61172f7341a39d944171b7ee1dc39e56e810f9d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 10:08:59 +0300 Subject: [PATCH 4/6] python312Packages.numcodecs: 0.13.0 -> 0.13.1 --- .../python-modules/numcodecs/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 5aa8130c73ea..403d5ea16051 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - fetchpatch, python, pythonOlder, @@ -19,18 +18,19 @@ # tests msgpack, pytestCheckHook, + importlib-metadata, }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uk+scDbqWgeMev4dTf/rloUIDULxnJwWsS2thmcDqi4="; + hash = "sha256-o883iB3wiY86nA1Ed9+IEz/oUYW//le6MbzC+iB3Cbw="; }; build-system = [ @@ -54,23 +54,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook msgpack + importlib-metadata ]; # https://github.com/NixOS/nixpkgs/issues/255262 pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ]; - disabledTests = [ - "test_backwards_compatibility" - - "test_encode_decode" - "test_legacy_codec_broken" - "test_bytes" - - # ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (3,) + inhomogeneous part. - # with numpy 1.24 - "test_non_numpy_inputs" - ]; - meta = { homepage = "https://github.com/zarr-developers/numcodecs"; license = lib.licenses.mit; From 0e3338f16f0abfd0d4c0b4221fb89722bb18a2dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 30 Oct 2024 09:12:51 +0200 Subject: [PATCH 5/6] python312Packages.zarr: modernize Use build-system & dependencies attributes; Don't use `with lib;` in meta, and order inputs. --- .../python-modules/zarr/default.nix | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 00a1a5699495..cc38c78b3c48 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -1,15 +1,20 @@ { lib, - asciitree, buildPythonPackage, - fasteners, fetchPypi, - numcodecs, - msgpack, - numpy, - pytestCheckHook, pythonOlder, + + # build-system setuptools-scm, + + # dependencies + asciitree, + numpy, + fasteners, + numcodecs, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -24,24 +29,28 @@ buildPythonPackage rec { hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ asciitree numpy fasteners numcodecs ] ++ numcodecs.optional-dependencies.msgpack; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "zarr" ]; - meta = with lib; { + meta = { description = "Implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; }; } From 6f9d95f616e8b69c0baa43a1e539ff4e7d4cdc2d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 30 Oct 2024 18:45:33 +0200 Subject: [PATCH 6/6] hydrus: 591 -> 595 Diff: https://github.com/hydrusnetwork/hydrus/compare/refs/tags/v591...v595 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f4740c7d9d23..3e05dd0c025e 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "591"; + version = "595"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-JhCnSNmCOEJdM5aEPpYWLpKy/EQ9BoN1A/aUAaILWtQ="; + hash = "sha256-bIUtFpAMCIeLAyGXi4Rgn8FmijN5NwbkC31JoVyjNdg="; }; nativeBuildInputs = [