From 51e463b04620c4f14778b9a67814dd2ed485e987 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 3 Jun 2026 21:26:47 +0700 Subject: [PATCH 1/3] python3Packages.augeas: migrate to pyproject --- pkgs/development/python-modules/augeas/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index fe208bb26a78..bc3345864013 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -7,11 +7,12 @@ augeas, cffi, pkgs, # for libxml2 + setuptools, }: buildPythonPackage rec { pname = "augeas"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hercules-team"; @@ -20,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-Lq8ckra3sqN38zo1d5JsEq6U5TtLKRmqysoWNwR9J9A="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -27,7 +30,7 @@ buildPythonPackage rec { pkgs.libxml2 ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; nativeCheckInputs = [ unittestCheckHook ]; From 212e75a8b427bdaa063935c593df5ea91f4f7947 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 3 Jun 2026 21:29:17 +0700 Subject: [PATCH 2/3] python3Packages.augeas: convert to finalAttrs --- pkgs/development/python-modules/augeas/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index bc3345864013..fb8f8fbf3252 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -9,7 +9,7 @@ pkgs, # for libxml2 setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "augeas"; version = "1.2.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hercules-team"; repo = "python-augeas"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Lq8ckra3sqN38zo1d5JsEq6U5TtLKRmqysoWNwR9J9A="; }; @@ -37,10 +37,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "augeas" ]; meta = { - changelog = "https://github.com/hercules-team/python-augeas/releases/tag/v${version}"; + changelog = "https://github.com/hercules-team/python-augeas/releases/tag/v${finalAttrs.version}"; description = "Pure python bindings for augeas"; homepage = "https://github.com/hercules-team/python-augeas"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; }; -} +}) From 20c2ee0526d55ac29ad05c777c89b3fe95981309 Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 3 Jun 2026 21:31:33 +0700 Subject: [PATCH 3/3] python3Packages.augeas: use tag in src --- pkgs/development/python-modules/augeas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index fb8f8fbf3252..1f0bb2cb80d2 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "hercules-team"; repo = "python-augeas"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Lq8ckra3sqN38zo1d5JsEq6U5TtLKRmqysoWNwR9J9A="; };