From 84866ae3b1a10ec40eb9c9cebeb167b4d0c66ef1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 22:17:50 +0100
Subject: [PATCH 1/2] python312Packages.json-api-doc: init at 0.15.0

JSON API parser returning a simple Python dictionary

https://github.com/julien-duponchelle/json-api-doc
---
 .../python-modules/json-api-doc/default.nix   | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/json-api-doc/default.nix

diff --git a/pkgs/development/python-modules/json-api-doc/default.nix b/pkgs/development/python-modules/json-api-doc/default.nix
new file mode 100644
index 000000000000..ba8b757ed7bd
--- /dev/null
+++ b/pkgs/development/python-modules/json-api-doc/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "json-api-doc";
+  version = "0.15.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchFromGitHub {
+    owner = "julien-duponchelle";
+    repo = "json-api-doc";
+    tag = "v${version}";
+    hash = "sha256-r6XduJ2GIr2hGen6hoNIdE3yqPzHJ9xAFOSbMgErsNA=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "'pytest-runner'," ""
+  '';
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "json_api_doc" ];
+
+  meta = {
+    description = "JSON API parser returning a simple Python dictionary";
+    homepage = "https://github.com/julien-duponchelle/json-api-doc";
+    changelog = "https://github.com/julien-duponchelle/json-api-doc/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b60d3574d51a..1617cb1db180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6691,6 +6691,8 @@ self: super: with self; {
 
   jsonlines = callPackage ../development/python-modules/jsonlines { };
 
+  json-api-doc = callPackage ../development/python-modules/json-api-doc { };
+
   json-logging = callPackage ../development/python-modules/json-logging { };
 
   jsonmerge = callPackage ../development/python-modules/jsonmerge { };

From 0675fe18c7fa266f32b71ccc36e17bf08d9f07a7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 2 Jan 2025 22:43:21 +0100
Subject: [PATCH 2/2] python312Packages.pyflick: 0.0.2 -> 1.1.2

Changelog: https://github.com/ZephireNZ/PyFlick/releases/tag/v1.1.2
---
 .../python-modules/pyflick/default.nix        | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix
index f9f7f084e0be..4b11027d55f0 100644
--- a/pkgs/development/python-modules/pyflick/default.nix
+++ b/pkgs/development/python-modules/pyflick/default.nix
@@ -1,27 +1,36 @@
 {
   lib,
-  buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
   aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  json-api-doc,
   python-dateutil,
+  setuptools-scm,
+  setuptools,
 }:
 
 buildPythonPackage rec {
-  pname = "pyflick";
-  version = "0.0.2";
-  format = "setuptools";
+  pname = "py-flick";
+  version = "1.1.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    pname = "PyFlick";
-    inherit version;
-    sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f";
+  src = fetchFromGitHub {
+    owner = "ZephireNZ";
+    repo = "PyFlick";
+    tag = "v${version}";
+    hash = "sha256-Csm5gXMIGEhHgzN/7sO/1iM/wZklI2Jc0C69tgYWxnQ=";
   };
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "aiohttp" ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
     aiohttp
+    json-api-doc
     python-dateutil
   ];
 
@@ -33,10 +42,11 @@ buildPythonPackage rec {
     "pyflick.authentication"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python API For Flick Electric in New Zealand";
     homepage = "https://github.com/ZephireNZ/PyFlick";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/ZephireNZ/PyFlick/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }