From 3852ff1e37b2e91f389e47640e0bd3e0881962ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 02:58:26 +0000 Subject: [PATCH 1/2] python39Packages.awkward: 1.10.0 -> 1.10.1 --- 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 86b76d75624c..215d424b5c7f 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.10.0"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HYnHJE5hhLNfS85r0I/4LrLvYL5n9XKSO8aq7jXatUQ="; + sha256 = "sha256-xjlO0l+xSghtY2IdnYT9wij11CpkWG8hVzGzb94XA0s="; }; nativeBuildInputs = [ cmake ]; From 7e4923de25d46afe23553b345dc116739b757576 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 08:51:56 +0200 Subject: [PATCH 2/2] python39Packages.awkward: disabled on older Python releases --- .../python-modules/awkward/default.nix | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 215d424b5c7f..c5517c827c4c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -5,6 +5,7 @@ , numba , numpy , pytestCheckHook +, pythonOlder , pyyaml , rapidjson , setuptools @@ -13,28 +14,48 @@ buildPythonPackage rec { pname = "awkward"; version = "1.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xjlO0l+xSghtY2IdnYT9wij11CpkWG8hVzGzb94XA0s="; + hash = "sha256-xjlO0l+xSghtY2IdnYT9wij11CpkWG8hVzGzb94XA0s="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ pyyaml rapidjson ]; - propagatedBuildInputs = [ numpy setuptools ]; # https://github.com/scikit-hep/awkward/blob/main/requirements.txt + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + pyyaml + rapidjson + ]; + + propagatedBuildInputs = [ + numpy + setuptools + ]; dontUseCmakeConfigure = true; - checkInputs = [ pytestCheckHook numba ]; + checkInputs = [ + pytestCheckHook + numba + ]; disabledTests = [ # incomatible with numpy 1.23 "test_numpyarray" ]; - disabledTestPaths = [ "tests-cuda" ]; + disabledTestPaths = [ + "tests-cuda" + ]; - pythonImportsCheck = [ "awkward" ]; + pythonImportsCheck = [ + "awkward" + ]; meta = with lib; { description = "Manipulate JSON-like data with NumPy-like idioms";