From 6b2f4f3d0e97834a8396e649482cd8885b9dcb67 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Sep 2024 11:39:27 +0200
Subject: [PATCH 1/2] python312Packages.flickrapi: refactor

---
 pkgs/development/python-modules/flickrapi/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix
index 9f55251a2c99..8f08dc8d1a53 100644
--- a/pkgs/development/python-modules/flickrapi/default.nix
+++ b/pkgs/development/python-modules/flickrapi/default.nix
@@ -9,23 +9,26 @@
   pytestCheckHook,
   responses,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "flickrapi";
   version = "2.4";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "sybrenstuvel";
-    repo = pname;
+    repo = "flickrapi";
     rev = "version-${version}";
     hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     requests
     requests-toolbelt
     requests-oauthlib
@@ -61,6 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python interface to the Flickr API";
     homepage = "https://stuvel.eu/flickrapi";
+    changelog = "https://github.com/sybrenstuvel/flickrapi/blob/version-${version}/CHANGELOG.md";
     license = licenses.psfl;
     maintainers = with maintainers; [ obadz ];
   };

From 72b40575d2431b090a4792a3832bff8200b7cde7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Sep 2024 11:41:30 +0200
Subject: [PATCH 2/2] python312Packages.flickrapi: patch tests

---
 pkgs/development/python-modules/flickrapi/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix
index 8f08dc8d1a53..9bbd11bd65b6 100644
--- a/pkgs/development/python-modules/flickrapi/default.nix
+++ b/pkgs/development/python-modules/flickrapi/default.nix
@@ -26,6 +26,12 @@ buildPythonPackage rec {
     hash = "sha256-vRZrlXKI0UDdmDevh3XUngH4X8G3VlOCSP0z/rxhIgw=";
   };
 
+  postPatch = ''
+    substituteInPlace tests/test_tokencache.py \
+      --replace-fail "assertEquals" "assertEqual" \
+      --replace-fail "assertNotEquals" "assertNotEqual"
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [