From b87647b2c1ae6b35533c70eea5180504cd364116 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 1 Jun 2026 23:54:43 +0200 Subject: [PATCH 1/2] python3Packages.amarna: migrate to pyproject --- pkgs/development/python-modules/amarna/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix index 80aea4deabdc..7caa02a74f06 100644 --- a/pkgs/development/python-modules/amarna/default.nix +++ b/pkgs/development/python-modules/amarna/default.nix @@ -5,12 +5,13 @@ lark, pydot, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "amarna"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "crytic"; @@ -19,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lark pydot ]; From 1fc67b28979b5a78d09b352412b0f2041896a2fb Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 1 Jun 2026 23:55:09 +0200 Subject: [PATCH 2/2] python3Packages.amarna: use finalAttrs --- pkgs/development/python-modules/amarna/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amarna/default.nix b/pkgs/development/python-modules/amarna/default.nix index 7caa02a74f06..042f3b193ea8 100644 --- a/pkgs/development/python-modules/amarna/default.nix +++ b/pkgs/development/python-modules/amarna/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "amarna"; version = "0.1.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "crytic"; repo = "amarna"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tyvHWBhanR7YH87MDWdXUsDEzZG6MgnbshezAbxWO+I="; }; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ raitobezarius ]; }; -} +})