From 4afc9675a9d86152a647d4b3ff40cf3298d9c606 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Apr 2024 16:05:48 +0000
Subject: [PATCH 1/3] python312Packages.molecule: 24.2.0 -> 24.2.1

---
 pkgs/development/python-modules/molecule/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index 309a3cdcfadf..7cdcb59f95e5 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "molecule";
-  version = "24.2.0";
+  version = "24.2.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-R8mCp9Bdt4Rtp3/nFZ3rlG8myvsuOI/HGBK+AImkF3Y=";
+    hash = "sha256-g1IrqpuRVg6phic8qxScORVpdunWEkVxciYyCTWtVuQ=";
   };
 
   nativeBuildInputs = [

From 97450273085fe430f796c63f6b6f1e64feea445a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 9 Apr 2024 19:36:41 +0200
Subject: [PATCH 2/3] python312Packages.molecule: refactor

---
 .../python-modules/molecule/default.nix       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index 7cdcb59f95e5..bf6dc0448800 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -1,28 +1,30 @@
 { lib
-, buildPythonPackage
-, fetchPypi
-, testers
 , ansible-compat
 , ansible-core
+, buildPythonPackage
 , click-help-colors
 , enrich
+, fetchPypi
 , jsonschema
 , molecule
-, withPlugins ? true, molecule-plugins
 , packaging
 , pluggy
+, pythonOlder
 , rich
 , setuptools
 , setuptools-scm
-, yamllint
+, testers
 , wcmatch
-, wheel
+, withPlugins ? true, molecule-plugins
+, yamllint
 }:
 
 buildPythonPackage rec {
   pname = "molecule";
   version = "24.2.1";
-  format = "pyproject";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
@@ -32,7 +34,6 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
   propagatedBuildInputs = [
@@ -63,9 +64,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Molecule aids in the development and testing of Ansible roles";
-    mainProgram = "molecule";
     homepage = "https://github.com/ansible-community/molecule";
-    maintainers = with maintainers; [ dawidd6 ];
+    changelog = "https://github.com/ansible/molecule/releases/tag/v${version}";
     license = licenses.mit;
+    maintainers = with maintainers; [ dawidd6 ];
+    mainProgram = "molecule";
   };
 }

From d030ba37a4cc5be86f096a1abf55631f4379c615 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 9 Apr 2024 19:37:40 +0200
Subject: [PATCH 3/3] python312Packages.molecule: format with nixfmt

---
 .../python-modules/molecule/default.nix       | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index bf6dc0448800..170d0bd2f741 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -1,22 +1,24 @@
-{ lib
-, ansible-compat
-, ansible-core
-, buildPythonPackage
-, click-help-colors
-, enrich
-, fetchPypi
-, jsonschema
-, molecule
-, packaging
-, pluggy
-, pythonOlder
-, rich
-, setuptools
-, setuptools-scm
-, testers
-, wcmatch
-, withPlugins ? true, molecule-plugins
-, yamllint
+{
+  lib,
+  ansible-compat,
+  ansible-core,
+  buildPythonPackage,
+  click-help-colors,
+  enrich,
+  fetchPypi,
+  jsonschema,
+  molecule,
+  packaging,
+  pluggy,
+  pythonOlder,
+  rich,
+  setuptools,
+  setuptools-scm,
+  testers,
+  wcmatch,
+  withPlugins ? true,
+  molecule-plugins,
+  yamllint,
 }:
 
 buildPythonPackage rec {
@@ -54,13 +56,15 @@ buildPythonPackage rec {
   # tests can't be easily run without installing things from ansible-galaxy
   doCheck = false;
 
-  passthru.tests.version = (testers.testVersion {
-    package = molecule;
-    command = "PY_COLORS=0 ${pname} --version";
-  }).overrideAttrs (old: {
-    # workaround the error: Permission denied: '/homeless-shelter'
-    HOME = "$(mktemp -d)";
-  });
+  passthru.tests.version =
+    (testers.testVersion {
+      package = molecule;
+      command = "PY_COLORS=0 ${pname} --version";
+    }).overrideAttrs
+      (old: {
+        # workaround the error: Permission denied: '/homeless-shelter'
+        HOME = "$(mktemp -d)";
+      });
 
   meta = with lib; {
     description = "Molecule aids in the development and testing of Ansible roles";