From 090ea50ba55595d55e7c2d55c886ea38d6bc0dfb Mon Sep 17 00:00:00 2001
From: Paul Dettorer Hervot <dettorer@dettorer.net>
Date: Tue, 29 Aug 2023 12:08:11 +0200
Subject: [PATCH 1/2] pythonPackages.pydiscourse: init at 1.4.0

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 .../python-modules/pydiscourse/default.nix    | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/pydiscourse/default.nix

diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix
new file mode 100644
index 000000000000..158954b711b6
--- /dev/null
+++ b/pkgs/development/python-modules/pydiscourse/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, requests
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pydiscourse";
+  version = "1.4.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  src = fetchFromGitHub {
+    owner = "pydiscourse";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg=";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  pythonImportsCheck = [ "pydiscourse" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/pydiscourse/pydiscourse";
+    changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}";
+    description = "A Python library for working with Discourse";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Dettorer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f36aeb1e0474..4bda951fde63 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8964,6 +8964,8 @@ self: super: with self; {
 
   pydigiham = callPackage ../development/python-modules/pydigiham { };
 
+  pydiscourse = callPackage ../development/python-modules/pydiscourse { };
+
   pydispatcher = callPackage ../development/python-modules/pydispatcher { };
 
   pydmd = callPackage ../development/python-modules/pydmd { };

From 42b7ffe5611a53db33d4c68997c893b0dc00f653 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 31 Aug 2023 10:43:11 +0200
Subject: [PATCH 2/2] python311Packages.pydiscourse: update ordering

- minor formatting tweaks
---
 .../python-modules/pydiscourse/default.nix     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix
index 158954b711b6..d17c719196e1 100644
--- a/pkgs/development/python-modules/pydiscourse/default.nix
+++ b/pkgs/development/python-modules/pydiscourse/default.nix
@@ -13,10 +13,6 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
-  nativeCheckInputs = [
-    unittestCheckHook
-  ];
-
   src = fetchFromGitHub {
     owner = "pydiscourse";
     repo = pname;
@@ -24,14 +20,22 @@ buildPythonPackage rec {
     hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    requests
+  ];
 
-  pythonImportsCheck = [ "pydiscourse" ];
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pydiscourse"
+  ];
 
   meta = with lib; {
+    description = "A Python library for working with Discourse";
     homepage = "https://github.com/pydiscourse/pydiscourse";
     changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}";
-    description = "A Python library for working with Discourse";
     license = licenses.mit;
     maintainers = with maintainers; [ Dettorer ];
   };