diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index e344b650b9e3..1cb64ff3cf51 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "awkward-cpp"; - version = "55"; + version = "56"; pyproject = true; __structuredAttrs = true; src = fetchPypi { pname = "awkward_cpp"; inherit (finalAttrs) version; - hash = "sha256-4si+Pmo1PW0qk9Zb4ZALqZd2WxYOp2aPmrIh3l+4o3M="; + hash = "sha256-zTY1+rkmxmMMCoXZK1mhWFHE9aiB6nSZhAaQJ2NPj1I="; }; build-system = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index b3d6dd569675..d6c144263831 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { pname = "awkward"; - version = "2.12.0"; + version = "2.13.0"; pyproject = true; __structuredAttrs = true; @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { owner = "scikit-hep"; repo = "awkward"; tag = "v${finalAttrs.version}"; - hash = "sha256-X5fwX4HCMPRaYEIEf5cgGWUodtb6eEmU7ue6mjCzVSA="; + hash = "sha256-z6/OoWLB5VqNe7iciiemXFp+RnvCLHn4cOA6zS3t6BE="; }; build-system = [ diff --git a/pkgs/development/python-modules/hist/default.nix b/pkgs/development/python-modules/hist/default.nix index ea689543c8b7..91e7f0278943 100644 --- a/pkgs/development/python-modules/hist/default.nix +++ b/pkgs/development/python-modules/hist/default.nix @@ -1,12 +1,19 @@ { lib, - fetchPypi, + stdenv, buildPythonPackage, - boost-histogram, - histoprint, + fetchFromGitHub, + + # build-system hatchling, hatch-vcs, + + # dependencies + boost-histogram, + histoprint, numpy, + + # tests pytestCheckHook, pytest-mpl, }: @@ -15,10 +22,13 @@ buildPythonPackage (finalAttrs: { pname = "hist"; version = "2.11.0"; pyproject = true; + __structuredAttrs = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - hash = "sha256-kusfoMo5utYZ9/cEs7qTxEs1U7BEX22ywXxnwBuctTQ="; + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "hist"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vAaP8oaZUUofymLu0uId94X+vt4o4XyRj5gITxs0ASs="; }; build-system = [ @@ -32,17 +42,23 @@ buildPythonPackage (finalAttrs: { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mpl ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # line 23: 92372 Trace/BPT trap: 5 + "test_to_hist_empty" + ]; + pythonImportsCheck = [ "hist" ]; meta = { description = "Histogramming for analysis powered by boost-histogram"; mainProgram = ""; homepage = "https://hist.readthedocs.io/"; + downloadPage = "https://github.com/scikit-hep/hist"; changelog = "https://github.com/scikit-hep/hist/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ veprbl ];