From e2db91c5cefd2b7255674b444286033022f5605d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Aug 2024 20:30:24 +0000
Subject: [PATCH 1/2] python312Packages.sphinxcontrib-confluencebuilder: 2.6.0
 -> 2.6.1

---
 .../sphinxcontrib-confluencebuilder/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
index dfb31f6ebcbe..745e858a55aa 100644
--- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-confluencebuilder";
-  version = "2.6.0";
+  version = "2.6.1";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "sphinxcontrib_confluencebuilder";
     inherit version;
-    hash = "sha256-yheaZjD62JUq8NUOjhcqK/nLUC9Q4xlQx9hlza3rgoc=";
+    hash = "sha256-9ymYfxL50ZDGlLzo2LXiBnuo2svWxnl37H/c6ENACjA=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 5826544e2a61574cd6649efed5c7b97fbc46006c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 6 Aug 2024 10:11:37 +0200
Subject: [PATCH 2/2] python312Packages.sphinxcontrib-confluencebuilder:
 refactor

---
 .../default.nix                                | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
index 745e858a55aa..1710b5212fd9 100644
--- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix
@@ -1,18 +1,21 @@
 {
   lib,
   buildPythonPackage,
+  docutils,
   fetchPypi,
   flit-core,
-  docutils,
-  sphinx,
-  requests,
   jinja2,
+  pythonOlder,
+  requests,
+  sphinx,
 }:
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-confluencebuilder";
   version = "2.6.1";
-  format = "pyproject";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     pname = "sphinxcontrib_confluencebuilder";
@@ -20,9 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-9ymYfxL50ZDGlLzo2LXiBnuo2svWxnl37H/c6ENACjA=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     docutils
     sphinx
     requests
@@ -38,9 +41,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Confluence builder for sphinx";
-    mainProgram = "sphinx-build-confluence";
     homepage = "https://github.com/sphinx-contrib/confluencebuilder";
+    changelog = "https://github.com/sphinx-contrib/confluencebuilder/blob/v${version}/CHANGES.rst";
     license = licenses.bsd1;
     maintainers = with maintainers; [ graysonhead ];
+    mainProgram = "sphinx-build-confluence";
   };
 }