From 2e1db341fc618873bd5ea36127854e3edc95a25f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 21 Jul 2023 10:38:01 +0200
Subject: [PATCH] apkg: 0.4.0 -> 0.4.1

https://apkg.readthedocs.io/en/latest/news/#apkg-041
---
 .../tools/package-management/apkg/default.nix | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/package-management/apkg/default.nix b/pkgs/tools/package-management/apkg/default.nix
index ebd1e15909f2..901a7aeff2b4 100644
--- a/pkgs/tools/package-management/apkg/default.nix
+++ b/pkgs/tools/package-management/apkg/default.nix
@@ -4,47 +4,38 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "apkg";
-  version = "0.4.0";
+  version = "0.4.1";
+  format = "pyproject";
 
   src = fetchFromGitLab {
     domain = "gitlab.nic.cz";
     owner = "packaging";
     repo = pname;
     rev = "v${version}";
-    sha256 = "duZz2Kwjgek5pMJTDH8gMZAZ13uFwaIYT5E1brW7I7U=";
+    sha256 = "x7UYkqkF1XJ3OMfQpIQ4+27KI0dLvL42Wms5xQTY/H4=";
   };
 
-  # TODO: solve this properly.  Detection won't work anymore.
-  postPatch = ''
-    patch <<-EOF
-      --- a/setup.py
-      +++ b/setup.py
-      @@ -25,1 +25,1 @@
-      -    version=version,
-      +    version='${version}',
-    EOF
-  '';
-
   propagatedBuildInputs = with python3Packages; [
     # copy&pasted requirements.txt (almost exactly)
     beautifulsoup4   # upstream version detection
-    blessings        # terminal colors
+    blessed          # terminal colors
     build            # apkg distribution
-    cached-property  # @cached_property for python <= 3.7
+    cached-property  # for python <= 3.7; but pip complains even with 3.8
     click            # nice CLI framework
     distro           # current distro detection
     jinja2           # templating
     packaging        # version parsing
     requests         # HTTP for humans™
-    setuptools       # required by minver
     toml             # config files
   ];
 
+  nativeBuildInputs = with python3Packages; [ hatchling ];
+
   makeWrapperArgs = [ # deps for `srcpkg` operation for other distros; could be optional
     "--prefix" "PATH" ":" (lib.makeBinPath [ gitMinimal rpm dpkg fakeroot ])
   ];
 
-  nativeCheckInputs = with python3Packages; [ pytest ];
+  nativeCheckInputs = with python3Packages; [ pytest dunamai ];
   checkPhase = ''
     runHook preCheck
     py.test # inspiration: .gitlab-ci.yml