From ddb82e2d4c7a58967f1589890053df95424eb18d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 1 Apr 2024 20:29:19 +0200 Subject: [PATCH 1/3] python311Packages.awkward-cpp: 30 -> 32 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v32 --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index ad54fd5e2d88..bd5c3197a097 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "30"; + version = "32"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-W+lMpzUdjkIcuUeKm3EBb6dnNiH6Ei1HfQsHu2iqfUw="; + hash = "sha256-rYxa+GIG+w9DSxZ0nMXMppoVqI4WykPpHlbFzKd0IfA="; }; nativeBuildInputs = [ From 3fe267190eba137a4bc55b2db7cba8dee2a2edfa Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Apr 2024 01:02:51 +0200 Subject: [PATCH 2/3] python311Packages.awkward: 2.6.2 -> 2.6.3 Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.6.2...v2.6.3 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.6.3 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index a093cb5d8e40..41043eef5dee 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-5wUTEB0iVffyCi671y4EsTum+7K1GDeAHlhdLpRgKnQ="; + hash = "sha256-zII5TZ0bzVEo5hTrLr45N7oL3lYhkCyNfZif+0vkEo4="; }; nativeBuildInputs = [ From 71fcc06aadc817fda676f9d273bb3cf52dd176b6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 2 Apr 2024 11:31:59 +0200 Subject: [PATCH 3/3] python311Packages.papermill: relax aiohttp dependency to fix build --- pkgs/development/python-modules/papermill/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 6124b14b4b93..f5e31356e2b3 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -18,6 +18,7 @@ , pytest-mock , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml , requests , setuptools @@ -39,7 +40,12 @@ buildPythonPackage rec { hash = "sha256-x6f5hhTdOPDVFiBvRhfrXq1wd5keYiuUshXnT0IkjX0="; }; + pythonRelaxDeps = [ + "aiohttp" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ];