From dacbfc29af3f469bce50781578dcf5d2be2fceb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Sep 2022 17:51:58 +0000 Subject: [PATCH 1/2] python310Packages.boost-histogram: 1.3.1 -> 1.3.2 --- pkgs/development/python-modules/boost-histogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index 109487b88b94..ff732aab3422 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.3.1"; + version = "1.3.2"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8="; + sha256 = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro="; }; nativeBuildInputs = [ setuptools-scm ]; From 268a43292cad3a6b1b8bc50fdf024d0650400120 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Sep 2022 22:03:15 +0200 Subject: [PATCH 2/2] python310Packages.boost-histogram: update disabled --- .../boost-histogram/default.nix | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index ff732aab3422..eb11f2f0b354 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -1,23 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark, setuptools-scm }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, boost +, numpy +, pytestCheckHook +, pytest-benchmark +, setuptools-scm +}: buildPythonPackage rec { pname = "boost-histogram"; version = "1.3.2"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro="; + hash = "sha256-4XXvvBBUonvFP7vpVHLKyeqTmZyR0GEYQNd2uZWI1Ro="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - buildInputs = [ boost ]; + buildInputs = [ + boost + ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - checkInputs = [ pytestCheckHook pytest-benchmark ]; + checkInputs = [ + pytestCheckHook + pytest-benchmark + ]; meta = with lib; { description = "Python bindings for the C++14 Boost::Histogram library";