From ec10b38284934dbde4f175962dec96c9e42d0187 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 5 Feb 2026 09:52:33 -0600
Subject: [PATCH 1/2] acltoolkit: update to use python3Packages and enable
 pyproject support

---
 pkgs/by-name/ac/acltoolkit/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ac/acltoolkit/package.nix b/pkgs/by-name/ac/acltoolkit/package.nix
index 67505709888f..1988da37dd21 100644
--- a/pkgs/by-name/ac/acltoolkit/package.nix
+++ b/pkgs/by-name/ac/acltoolkit/package.nix
@@ -1,15 +1,15 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
 }:
 
-python3.pkgs.buildPythonPackage {
+python3Packages.buildPythonPackage {
   pname = "acltoolkit";
-  version = "0-unstable-2023-02-03";
+  version = "0.2.2-unstable-2023-02-03";
   pyproject = true;
 
-  build-system = with python3.pkgs; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
   src = fetchFromGitHub {
     owner = "zblurx";
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonPackage {
     sed -i -e "s/==[0-9.]*//" setup.py
   '';
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     asn1crypto
     dnspython
     impacket

From 10c05ee10494b4bb06d1560d3658c0163a432daa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 13 May 2026 09:39:32 +0200
Subject: [PATCH 2/2] acltoolkit: migrate to finalAttrs

---
 pkgs/by-name/ac/acltoolkit/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ac/acltoolkit/package.nix b/pkgs/by-name/ac/acltoolkit/package.nix
index 1988da37dd21..835995193872 100644
--- a/pkgs/by-name/ac/acltoolkit/package.nix
+++ b/pkgs/by-name/ac/acltoolkit/package.nix
@@ -4,16 +4,15 @@
   fetchFromGitHub,
 }:
 
-python3Packages.buildPythonPackage {
+python3Packages.buildPythonPackage (finalAttrs: {
   pname = "acltoolkit";
   version = "0.2.2-unstable-2023-02-03";
   pyproject = true;
 
-  build-system = with python3Packages; [ setuptools ];
-
   src = fetchFromGitHub {
     owner = "zblurx";
     repo = "acltoolkit";
+    # https://github.com/zblurx/acltoolkit/issues/6
     rev = "a5219946aa445c0a3b4a406baea67b33f78bca7c";
     hash = "sha256-97cbkGyIkq2Pk1hydMcViXWoh+Ipi3m0YvEYiaV4zcM=";
   };
@@ -23,6 +22,8 @@ python3Packages.buildPythonPackage {
     sed -i -e "s/==[0-9.]*//" setup.py
   '';
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [
     asn1crypto
     dnspython
@@ -35,15 +36,13 @@ python3Packages.buildPythonPackage {
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "acltoolkit"
-  ];
+  pythonImportsCheck = [ "acltoolkit" ];
 
   meta = {
     description = "ACL abuse swiss-knife";
-    mainProgram = "acltoolkit";
     homepage = "https://github.com/zblurx/acltoolkit";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "acltoolkit";
   };
-}
+})