From ae0ee21fe9c2f1415be8e34033cf8699700ee6f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 May 2024 10:31:11 +0200 Subject: [PATCH 1/3] python312Packages.thriftpy2: 0.4.20 -> 0.5.0 Diff: https://github.com/Thriftpy/thriftpy2/compare/refs/tags/v0.4.20...v0.5.0 Changelog: https://github.com/Thriftpy/thriftpy2/blob/v0.5.0/CHANGES.rst --- pkgs/development/python-modules/thriftpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index e6a696dec9bb..ea6701bd1923 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.20"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IEYoSLaJUeQdwHaXR0UUlCZg5zBEh5Y2/IwB4RVEAcg="; + hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; }; nativeBuildInputs = [ From bd99afd30378131a4420cc873cdeba11d8b21323 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 May 2024 10:32:48 +0200 Subject: [PATCH 2/3] python312Packages.thriftpy2: refactor --- pkgs/development/python-modules/thriftpy2/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index ea6701bd1923..c8df37d6605e 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -5,28 +5,33 @@ , ply , pythonOlder , six +, setuptools , tornado }: buildPythonPackage rec { pname = "thriftpy2"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Thriftpy"; - repo = pname; + repo = "thriftpy2"; rev = "refs/tags/v${version}"; hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; }; + build-system = [ + setuptools + ]; + nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ ply six tornado From 38db716fa3c4299339a7a415ff2a5ebc24bbddc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 May 2024 10:33:37 +0200 Subject: [PATCH 3/3] python312Packages.thriftpy2: format with nixfmt --- .../python-modules/thriftpy2/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index c8df37d6605e..4a125dd1775b 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, cython -, fetchFromGitHub -, ply -, pythonOlder -, six -, setuptools -, tornado +{ + lib, + buildPythonPackage, + cython, + fetchFromGitHub, + ply, + pythonOlder, + six, + setuptools, + tornado, }: buildPythonPackage rec { @@ -23,13 +24,9 @@ buildPythonPackage rec { hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - cython - ]; + nativeBuildInputs = [ cython ]; dependencies = [ ply @@ -40,9 +37,7 @@ buildPythonPackage rec { # Not all needed files seems to be present doCheck = false; - pythonImportsCheck = [ - "thriftpy2" - ]; + pythonImportsCheck = [ "thriftpy2" ]; meta = with lib; { description = "Python module for Apache Thrift";