From 327076a54b73da302bad56ec54bd91cb77ded48a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 03:22:58 +0000 Subject: [PATCH 1/2] python310Packages.amazon-ion: 0.8.0 -> 0.9.1 --- pkgs/development/python-modules/amazon-ion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 016fa989a8ab..afa81564a848 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.8.0"; + version = "0.9.1"; src = fetchPypi { pname = "amazon.ion"; inherit version; - sha256 = "sha256-vtztUHSnGoPYozhwvigxEdieVtbKNfV4B5yZ4MHaWGw="; + sha256 = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA="; }; postPatch = '' From 03213c6216ee05925f0bf757f97d34ac6abbcefe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Apr 2022 10:22:59 +0200 Subject: [PATCH 2/2] python3Packages.amazon-ion: disable on older Python releases --- .../python-modules/amazon-ion/default.nix | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index afa81564a848..eb83fcce471b 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -1,29 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi, jsonconversion, six, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, jsonconversion +, six +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "amazon-ion"; version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "amazon.ion"; inherit version; - sha256 = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA="; + hash = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA="; }; postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" ''; - propagatedBuildInputs = [ jsonconversion six ]; + propagatedBuildInputs = [ + jsonconversion + six + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "amazon.ion" ]; + pythonImportsCheck = [ + "amazon.ion" + ]; meta = with lib; { - description = "A Python implementation of Amazon Ion"; + description = "Python implementation of Amazon Ion"; homepage = "https://github.com/amzn/ion-python"; license = licenses.asl20; - maintainers = [ maintainers.terlar ]; + maintainers = with maintainers; [ terlar ]; }; }