From 981558630feadda13caa27713872cc0603333a5c Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 26 Dec 2025 10:51:52 -0500
Subject: [PATCH] podman-compose: migrate to by-name, add tests

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../po/podman-compose/package.nix}            | 26 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 17 insertions(+), 11 deletions(-)
 rename pkgs/{applications/virtualization/podman-compose/default.nix => by-name/po/podman-compose/package.nix} (62%)

diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/by-name/po/podman-compose/package.nix
similarity index 62%
rename from pkgs/applications/virtualization/podman-compose/default.nix
rename to pkgs/by-name/po/podman-compose/package.nix
index 5288cb5f0855..38dd0d3ef246 100644
--- a/pkgs/applications/virtualization/podman-compose/default.nix
+++ b/pkgs/by-name/po/podman-compose/package.nix
@@ -1,14 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  python-dotenv,
-  pyyaml,
-  setuptools,
-  pypaBuildHook,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   version = "1.5.0";
   pname = "podman-compose";
   pyproject = true;
@@ -21,14 +17,26 @@ buildPythonApplication rec {
   };
 
   build-system = [
-    setuptools
+    python3Packages.setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     python-dotenv
     pyyaml
   ];
-  propagatedBuildInputs = [ pypaBuildHook ];
+
+  propagatedBuildInputs = [ python3Packages.pypaBuildHook ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+    parameterized
+  ];
+
+  disabledTestPaths = [
+    "tests/integration" # requires running podman
+  ];
+
+  # versionCheckHook requires podman executable
 
   meta = {
     description = "Implementation of docker-compose with podman backend";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02ee980f3aab..be5f6ca22856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3608,8 +3608,6 @@ with pkgs;
 
   po4a = perlPackages.Po4a;
 
-  podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { };
-
   polaris = callPackage ../servers/polaris { };
 
   polaris-web = callPackage ../servers/polaris/web.nix { };