From 681b500b6faaccf5a0b685ce226295d89bafbd6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:18:07 +0200 Subject: [PATCH 1/3] python311Packages.json-tricks: 3.15.5 -> 3.17.2 Diff: https://github.com/mverleg/pyjson_tricks/compare/v3.15.5...v3.17.2 --- pkgs/development/python-modules/json-tricks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index 65ed7e7220fe..a9fd6f24aa2d 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "json-tricks"; - version = "3.15.5"; + version = "3.17.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "mverleg"; repo = "pyjson_tricks"; rev = "v${version}"; - sha256 = "wdpqCqMO0EzKyqE4ishL3CTsSw3sZPGvJ0HEktKFgZU="; + sha256 = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; }; nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ]; From d2514e1a8e2f833f36fced192ccd0fad2d92fe29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:28:03 +0200 Subject: [PATCH 2/3] python311Packages.json-tricks: add format --- .../python-modules/json-tricks/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index a9fd6f24aa2d..74d30d1aa468 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -11,18 +11,27 @@ buildPythonPackage rec { pname = "json-tricks"; version = "3.17.2"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "mverleg"; repo = "pyjson_tricks"; - rev = "v${version}"; - sha256 = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; + rev = "refs/tags/v${version}"; + hash = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; }; - nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ]; + nativeCheckInputs = [ + numpy + pandas + pytz + pytestCheckHook + ]; - pythonImportsCheck = [ "json_tricks" ]; + pythonImportsCheck = [ + "json_tricks" + ]; meta = with lib; { description = "Extra features for Python JSON handling"; From ea0c453fea3949b82f89475b6b10cddd77831564 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Aug 2023 23:28:38 +0200 Subject: [PATCH 3/3] python311Packages.json-tricks: update disabled --- pkgs/development/python-modules/json-tricks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/json-tricks/default.nix b/pkgs/development/python-modules/json-tricks/default.nix index 74d30d1aa468..f6f0ddf77cba 100644 --- a/pkgs/development/python-modules/json-tricks/default.nix +++ b/pkgs/development/python-modules/json-tricks/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "3.17.2"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mverleg";