From a7cf1dfd8b41e5331102d906bf498e86d9110ff6 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Wed, 30 Mar 2022 10:51:50 +0200 Subject: [PATCH 1/4] python310Packages.jsonconversion: init at 0.2.13 --- .../python-modules/jsonconversion/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/jsonconversion/default.nix diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix new file mode 100644 index 000000000000..22f7fe4625d1 --- /dev/null +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, numpy }: + +buildPythonPackage rec { + pname = "jsonconversion"; + version = "0.2.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-4hMY0N/Px+g5zn3YzNfDWPyi8Pglvd/c2N9SeC4JoZ0="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + + checkInputs = [ pytestCheckHook numpy ]; + + pythonImportsCheck = [ "jsonconversion" ]; + + meta = with lib; { + description = "This python module helps converting arbitrary Python objects into JSON strings and back"; + homepage = "https://pypi.org/project/jsonconversion/"; + license = licenses.bsd2; + maintainers = [ maintainers.terlar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3bb64ad8f29..379d9938e865 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4296,6 +4296,8 @@ in { json5 = callPackage ../development/python-modules/json5 { }; + jsonconversion = callPackage ../development/python-modules/jsonconversion { }; + jsondate = callPackage ../development/python-modules/jsondate { }; jsondiff = callPackage ../development/python-modules/jsondiff { }; From 98a276576885a920310d877305901eaba1a79b00 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Wed, 30 Mar 2022 10:53:45 +0200 Subject: [PATCH 2/4] python310Packages.amazon-ion: init at 0.8.0 --- .../python-modules/amazon-ion/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/amazon-ion/default.nix diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix new file mode 100644 index 000000000000..016fa989a8ab --- /dev/null +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, jsonconversion, six, pytestCheckHook }: + +buildPythonPackage rec { + pname = "amazon-ion"; + version = "0.8.0"; + + src = fetchPypi { + pname = "amazon.ion"; + inherit version; + sha256 = "sha256-vtztUHSnGoPYozhwvigxEdieVtbKNfV4B5yZ4MHaWGw="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ jsonconversion six ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "amazon.ion" ]; + + meta = with lib; { + description = "A Python implementation of Amazon Ion"; + homepage = "https://github.com/amzn/ion-python"; + license = licenses.asl20; + maintainers = [ maintainers.terlar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 379d9938e865..70d177fbe8d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -470,6 +470,8 @@ in { altair = callPackage ../development/python-modules/altair { }; + amazon-ion = callPackage ../development/python-modules/amazon-ion { }; + amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; ambee = callPackage ../development/python-modules/ambee { }; From 4e2a9675660d3093c0f69658b97f9dd1966eb03b Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Wed, 30 Mar 2022 10:54:59 +0200 Subject: [PATCH 3/4] python310Packages.ionhash: init at 1.2.1 --- .../python-modules/ionhash/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/ionhash/default.nix diff --git a/pkgs/development/python-modules/ionhash/default.nix b/pkgs/development/python-modules/ionhash/default.nix new file mode 100644 index 000000000000..4d90d572876c --- /dev/null +++ b/pkgs/development/python-modules/ionhash/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, amazon-ion, six, pytestCheckHook }: + +buildPythonPackage rec { + pname = "ionhash"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "amzn"; + repo = "ion-hash-python"; + rev = "v${version}"; + sha256 = "sha256-mXOLKXauWwwIA/LnF4qyZsBiF/QM+rF9MmE2ewmozYo="; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/amzn/ion-hash-python/commit/5cab56d694ecc176e394bb455c2d726ba1514ce0.patch"; + sha256 = "sha256-P5QByNafgxI//e3m+b0oG00+rVymCsT/J4dOZSk3354="; + }) + ]; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + ''; + + propagatedBuildInputs = [ amazon-ion six ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "ionhash" ]; + + meta = with lib; { + description = "Python implementation of Amazon Ion Hash"; + homepage = "https://github.com/amzn/ion-hash-python"; + license = licenses.asl20; + maintainers = [ maintainers.terlar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70d177fbe8d0..4c66f942609a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4090,6 +4090,8 @@ in { iocapture = callPackage ../development/python-modules/iocapture { }; + ionhash = callPackage ../development/python-modules/ionhash { }; + iotawattpy = callPackage ../development/python-modules/iotawattpy { }; iowait = callPackage ../development/python-modules/iowait { }; From 441eaf829267d1512835c27c36f4d7f2ef3510ac Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Wed, 30 Mar 2022 12:18:25 +0200 Subject: [PATCH 4/4] python310Packages.pyqldb: init at 3.2.2 --- .../python-modules/pyqldb/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pyqldb/default.nix diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix new file mode 100644 index 000000000000..a6fd8665fd14 --- /dev/null +++ b/pkgs/development/python-modules/pyqldb/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchFromGitHub, boto3, amazon-ion, ionhash, pytestCheckHook }: + +buildPythonPackage rec { + pname = "pyqldb"; + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "amazon-qldb-driver-python"; + rev = "v${version}"; + sha256 = "sha256-TKf43+k428h8T6ye6mJrnK9D4J1xpIu0QacM7lWJF7w="; + }; + + propagatedBuildInputs = [ boto3 amazon-ion ionhash ]; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export AWS_DEFAULT_REGION=us-east-1 + ''; + + pytestFlagsArray = [ "tests/unit" ]; + + pythonImportsCheck = [ "pyqldb" ]; + + meta = with lib; { + description = "Python driver for Amazon QLDB"; + homepage = "https://github.com/awslabs/amazon-qldb-driver-python"; + license = licenses.asl20; + maintainers = [ maintainers.terlar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c66f942609a..751704f72787 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7480,6 +7480,8 @@ in { pypytools = callPackage ../development/python-modules/pypytools { }; + pyqldb = callPackage ../development/python-modules/pyqldb { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; pyqt-builder = callPackage ../development/python-modules/pyqt-builder { };