From 3e83bb9f4c78a61d266badb59bfe5963086658ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Aug 2023 00:59:16 +0000 Subject: [PATCH 1/2] python310Packages.pygccxml: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/pygccxml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index f07340ce2fb8..304e588b8807 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -2,13 +2,13 @@ llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "gccxml"; repo = "pygccxml"; - rev = "v${version}"; - sha256 = "1msqpg3dqn7wjlf91ddljxzz01a3b1p2sy91n36lrsy87lz499gh"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; }; buildInputs = [ castxml llvmPackages.libcxxStdenv]; From 124a6ef9b085494fc643af3cfe497759ed6ddb54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Aug 2023 14:42:17 +0200 Subject: [PATCH 2/2] python310Packages.pygccxml: add format - disable on unsupported Python releases - add changelog to meta --- .../python-modules/pygccxml/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 304e588b8807..f4f842852b0c 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -1,25 +1,38 @@ -{ lib, castxml, fetchFromGitHub, buildPythonPackage, -llvmPackages }: +{ lib +, castxml +, fetchFromGitHub +, buildPythonPackage +, llvmPackages +, pythonOlder +}: + buildPythonPackage rec { pname = "pygccxml"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "gccxml"; - repo = "pygccxml"; + owner = "gccxml"; + repo = "pygccxml"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; + hash = "sha256-+cmp41iWbkUSLNFLvEPHocpTQAX2CpD8HMXLIYcy+8k="; }; - buildInputs = [ castxml llvmPackages.libcxxStdenv]; + buildInputs = [ + castxml + llvmPackages.libcxxStdenv + ]; # running the suite is hard, needs to generate xml_generator.cfg # but the format doesn't accept -isystem directives doCheck = false; meta = with lib; { - homepage = "https://github.com/gccxml/pygccxml"; description = "Python package for easy C++ declarations navigation"; + homepage = "https://github.com/gccxml/pygccxml"; + changelog = "https://github.com/CastXML/pygccxml/blob/v${version}/CHANGELOG.md"; license = licenses.boost; maintainers = with maintainers; [ teto ]; };