From 6b3a5bf71e15dc272661fdf90dc7e62423b34d8f Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 7 Jun 2026 07:58:36 +0700 Subject: [PATCH 1/2] python3Packages.cccolutils: migrate to pyproject --- pkgs/development/python-modules/cccolutils/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index ee5895c411dc..6ad65300fbfa 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, git, gitpython, krb5-c, # C krb5 library, not PyPI krb5 @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "cccolutils"; version = "1.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "CCColUtils"; @@ -20,9 +21,11 @@ buildPythonPackage rec { hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8="; }; + build-system = [ setuptools ]; + buildInputs = [ krb5-c ]; - propagatedBuildInputs = [ + dependencies = [ git gitpython mock From 3de7dbbd400390931eb8c26a8db69e448a9b26b5 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 7 Jun 2026 08:00:15 +0700 Subject: [PATCH 2/2] python3Packages.cccolutils: modernize --- pkgs/development/python-modules/cccolutils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index 6ad65300fbfa..569016231253 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -10,14 +10,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cccolutils"; version = "1.5"; pyproject = true; + __structuredAttrs = true; + src = fetchPypi { pname = "CCColUtils"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-YzKjG43biRbTZKtzSUHHhtzOfcZfzISHDFolqzrBjL8="; }; @@ -40,4 +42,4 @@ buildPythonPackage rec { homepage = "https://pagure.io/cccolutils"; license = lib.licenses.gpl2Plus; }; -} +})