From 04c151b9e35c1cd7ba6f03426d97a17aea251436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 11:33:46 +0000 Subject: [PATCH 1/2] python310Packages.python-box: 6.0.2 -> 6.10.0 --- pkgs/development/python-modules/python-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 01805c6a2d22..d01fd33314ab 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.0.2"; + version = "6.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; - rev = version; - hash = "sha256-IE2qyRzvrOTymwga+hCwE785sAVTqQtcN1DL/uADpbQ="; + rev = "refs/tags/${version}"; + hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; }; propagatedBuildInputs = [ From b893054798674bb7fc66e00285abee66a12b8af7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 19:10:35 +0100 Subject: [PATCH 2/2] python310Packages.python-box: update disabled - use optional-dependencies --- .../python-modules/python-box/default.nix | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index d01fd33314ab..4b4737b3373c 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -7,32 +7,55 @@ , pyyaml , ruamel-yaml , toml +, tomli +, tomli-w }: buildPythonPackage rec { pname = "python-box"; - version = "6.10.0"; + version = "6.0.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; - rev = "refs/tags/${version}"; - hash = "sha256-42VDZ4aASFFWhRY3ApBQ4dq76eD1flZtxUM9hpA9iiI="; + rev = version; + hash = "sha256-IE2qyRzvrOTymwga+hCwE785sAVTqQtcN1DL/uADpbQ="; }; - propagatedBuildInputs = [ - msgpack - pyyaml - ruamel-yaml - toml - ]; + passthru.optional-dependencies = { + all = [ + msgpack + ruamel-yaml + toml + ]; + yaml = [ + ruamel-yaml + ]; + ruamel-yaml = [ + ruamel-yaml + ]; + PyYAML = [ + pyyaml + ]; + tomli = [ + tomli-w + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + toml = [ + toml + ]; + msgpack = [ + msgpack + ]; + }; checkInputs = [ pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.all; pythonImportsCheck = [ "box"