From b17fd7b4eedf8f3f4cce28ecf820e67c8a9a512e Mon Sep 17 00:00:00 2001
From: Austin Butler <austin@butler.lol>
Date: Mon, 10 Mar 2025 14:16:31 -0700
Subject: [PATCH] mnamer: 2.5.4 -> 2.5.5

---
 .../mn/mnamer/cached_session_error.patch      | 28 +++++++++++++
 pkgs/by-name/mn/mnamer/package.nix            | 41 +++++++++++--------
 .../mn/mnamer/remove_requirements.patch       | 21 ----------
 pkgs/by-name/mn/mnamer/update_hack.patch      | 13 ------
 4 files changed, 53 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/by-name/mn/mnamer/cached_session_error.patch
 delete mode 100644 pkgs/by-name/mn/mnamer/remove_requirements.patch
 delete mode 100644 pkgs/by-name/mn/mnamer/update_hack.patch

diff --git a/pkgs/by-name/mn/mnamer/cached_session_error.patch b/pkgs/by-name/mn/mnamer/cached_session_error.patch
new file mode 100644
index 000000000000..f6a3d9a15f2f
--- /dev/null
+++ b/pkgs/by-name/mn/mnamer/cached_session_error.patch
@@ -0,0 +1,28 @@
+From 94ea94de526770e783d04d75b981dfa3ac90fd20 Mon Sep 17 00:00:00 2001
+From: o7-machienhum <ryan.cjw@gmail.com>
+Date: Tue, 30 Jan 2024 03:29:09 -0800
+Subject: [PATCH] Fixes crash
+
+---
+ mnamer/utils.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/mnamer/utils.py b/mnamer/utils.py
+index 84df7870..8eba68f8 100644
+--- a/mnamer/utils.py
++++ b/mnamer/utils.py
+@@ -256,7 +256,6 @@ def request_json(
+         "like Gecko) Chrome/79.0.3945.88 Safari/537.36"
+     )
+ 
+-    initial_cache_state = session._disabled  # yes, i'm a bad person
+     try:
+         session._disabled = not cache
+         response = session.request(
+@@ -272,8 +271,6 @@ def request_json(
+     except:
+         content = None
+         status = 500
+-    finally:
+-        session._disabled = initial_cache_state
+     return status, (content or {})
diff --git a/pkgs/by-name/mn/mnamer/package.nix b/pkgs/by-name/mn/mnamer/package.nix
index 8477f95ab666..6935fbf5d1de 100644
--- a/pkgs/by-name/mn/mnamer/package.nix
+++ b/pkgs/by-name/mn/mnamer/package.nix
@@ -1,31 +1,40 @@
-{ python3Packages, fetchFromGitHub, lib }:
+{
+  python3Packages,
+  fetchFromGitHub,
+  lib,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "mnamer";
-  version = "2.5.4";
+  version = "2.5.5";
+  format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "jkwill87";
     repo = "mnamer";
-    rev = version;
-    sha256 = "sha256-fONQq/RboWHFuEFU7HP1ThUpSjOIlkg54c2WlMUKwuk=";
+    tag = version;
+    sha256 = "sha256-qQu5V1GOsbrR00HOrot6TTAkc3KRasBPDEU7ZojUBio=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
-    babelfish
-    requests
-    appdirs
-    teletype
-    requests-cache
-    guessit
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
   ];
 
-  patches = [
-    # requires specific old versions of dependencies which have been updated in nixpkgs
-    ./remove_requirements.patch
+  dependencies = with python3Packages; [
+    appdirs
+    babelfish
+    guessit
+    requests
+    requests-cache
+    teletype
+  ];
 
-    # author reads a private property that changed between versions
-    ./update_hack.patch
+  pythonRelaxDeps = true;
+
+  patches = [
+    # https://github.com/jkwill87/mnamer/pull/291
+    ./cached_session_error.patch
   ];
 
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];
diff --git a/pkgs/by-name/mn/mnamer/remove_requirements.patch b/pkgs/by-name/mn/mnamer/remove_requirements.patch
deleted file mode 100644
index 46fc0571ce5e..000000000000
--- a/pkgs/by-name/mn/mnamer/remove_requirements.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 245c1dd..fdc17ab 100755
---- a/setup.py
-+++ b/setup.py
-@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION
- with open("readme.md", "r", encoding="utf8") as fp:
-     LONG_DESCRIPTION = fp.read()
- 
--with open("requirements.txt", "r", encoding="utf8") as fp:
--    REQUIREMENTS = fp.read().splitlines()
--
- setup(
-     author="Jessy Williams",
-     author_email="jessy@jessywilliams.com",
-     description="A media file organiser",
-     entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]},
-     include_package_data=True,
--    install_requires=REQUIREMENTS,
-     license="MIT",
-     long_description=LONG_DESCRIPTION,
-     long_description_content_type="text/markdown",
diff --git a/pkgs/by-name/mn/mnamer/update_hack.patch b/pkgs/by-name/mn/mnamer/update_hack.patch
deleted file mode 100644
index 56c83a20a9ce..000000000000
--- a/pkgs/by-name/mn/mnamer/update_hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mnamer/utils.py b/mnamer/utils.py
-index 636b596..e52bd37 100644
---- a/mnamer/utils.py
-+++ b/mnamer/utils.py
-@@ -280,7 +280,7 @@ def request_json(
-         "like Gecko) Chrome/79.0.3945.88 Safari/537.36"
-     )
- 
--    initial_cache_state = session._is_cache_disabled  # yes, i'm a bad person
-+    initial_cache_state = session._disabled  # yes, i'm a bad person
-     try:
-         session._is_cache_disabled = not cache
-         response = session.request(