From 20fdfc2fba9c970f338b54ebbefb34ac5545d600 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 7 Aug 2024 16:47:28 +0200
Subject: [PATCH 1/2] python312Packages.podman: 5.0.0 -> 5.2.0

Diff: containers/podman-py@refs/tags/v5.0.0...v5.2.0

Changelog: https://github.com/containers/podman-py/releases/tag/v5.2.0
---
 .../python-modules/podman/default.nix          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix
index 3ba10ffb06b6..11f3a62535b4 100644
--- a/pkgs/development/python-modules/podman/default.nix
+++ b/pkgs/development/python-modules/podman/default.nix
@@ -5,7 +5,6 @@
   fixtures,
   pytestCheckHook,
   pythonOlder,
-  pyxdg,
   requests,
   requests-mock,
   rich,
@@ -16,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "podman";
-  version = "5.0.0";
+  version = "5.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,18 +24,19 @@ buildPythonPackage rec {
     owner = "containers";
     repo = "podman-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3tbhTg060/K4ejT/xjItSu9zf05LR/d0vkg4XDsspEE=";
+    hash = "sha256-2NsF00jaW2wl99sTxTQ5xJkqNOYh9RaecmBMcWP3TI8=";
   };
 
   build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    pyxdg
+  dependencies = [
     requests
-    rich
-    tomli
     urllib3
-  ];
+  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+
+  passthru.optional-dependencies = {
+    progress_bar = [ rich ];
+  };
 
   nativeCheckInputs = [
     fixtures
@@ -54,6 +54,7 @@ buildPythonPackage rec {
     # Integration tests require a running container setup
     "AdapterIntegrationTest"
     "ContainersIntegrationTest"
+    "ContainersExecIntegrationTests"
     "ImagesIntegrationTest"
     "ManifestsIntegrationTest"
     "NetworksIntegrationTest"
@@ -69,6 +70,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/containers/podman-py/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
-    mainProgram = "podman";
   };
 }

From 8f7e8fb486637459e9b048f38522c3bcc8296cb8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 7 Aug 2024 16:48:11 +0200
Subject: [PATCH 2/2] python312Packages.ansible-navigator: 24.3.2 -> 24.7.0

Changelog: https://github.com/ansible/ansible-navigator/releases/tag/v24.7.0
---
 .../ansible-navigator/default.nix             | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-navigator/default.nix b/pkgs/development/python-modules/ansible-navigator/default.nix
index 96e6330f3815..a795039d1c21 100644
--- a/pkgs/development/python-modules/ansible-navigator/default.nix
+++ b/pkgs/development/python-modules/ansible-navigator/default.nix
@@ -5,18 +5,23 @@
   podman,
   fetchPypi,
   buildPythonPackage,
+  pythonOlder,
 }:
+
 buildPythonPackage rec {
   pname = "ansible-navigator";
-  version = "24.3.2";
-  format = "pyproject";
+  version = "24.7.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-IAcZFisB3BOmdxZuGZ3PZcDl2CXsg6ToI/1fdPpkIXw=";
+    pname = "ansible_navigator";
+    inherit version;
+    hash = "sha256-XMwJzDxo/VZ+0qy5MLg/Kw/7j3V594qfV+T6jeVEWzg=";
   };
 
-  buildInputs = with python3Packages; [
+  build-system = with python3Packages; [
     setuptools
     setuptools-scm
   ];
@@ -32,15 +37,15 @@ buildPythonPackage rec {
     onigurumacffi
   ];
 
-  patchPhase = ''
-    # scm_git_archive doesn't exist anymore. Fixed upstream but unreleased
-    # Rev: https://github.com/ansible/ansible-navigator/pull/1716
-    sed -i '/setuptools_scm_git_archive/d' pyproject.toml
-  '';
+  # Tests want to run in tmux
+  doCheck = false;
+
+  pythonImportsCheck = [ "ansible_navigator" ];
 
   meta = with lib; {
     description = "Text-based user interface (TUI) for Ansible";
     homepage = "https://ansible.readthedocs.io/projects/navigator/";
+    changelog = "https://github.com/ansible/ansible-navigator/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ melkor333 ];
   };