From 121fb574b083b3c8ce57be02d3487b7774264385 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 May 2025 02:51:07 +0000
Subject: [PATCH 1/2] python3Packages.moreorless: 0.4.0 -> 0.5.0

---
 pkgs/development/python-modules/moreorless/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix
index e0faed09af0a..b5d3d8c3c091 100644
--- a/pkgs/development/python-modules/moreorless/default.nix
+++ b/pkgs/development/python-modules/moreorless/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "moreorless";
-  version = "0.4.0";
+  version = "0.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "thatch";
     repo = "moreorless";
     tag = "v${version}";
-    hash = "sha256-N11iqsxMGgzwW2QYeOoHQaR/aDEuoUnnd/2Mc5culN0=";
+    hash = "sha256-VCvvPxDWriaeKeRaj/YbPLPfNL7fipGwCydr6K0HMjc=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 68001ad1fcba1252242a2b6ef54974f9853503de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 15 May 2025 11:12:04 -0700
Subject: [PATCH 2/2] python3Packages.moreorless: modernize

---
 .../python-modules/moreorless/default.nix       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix
index b5d3d8c3c091..d2ab01a2c18f 100644
--- a/pkgs/development/python-modules/moreorless/default.nix
+++ b/pkgs/development/python-modules/moreorless/default.nix
@@ -5,16 +5,13 @@
   fetchFromGitHub,
   parameterized,
   pytestCheckHook,
-  pythonOlder,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "moreorless";
   version = "0.5.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thatch";
@@ -23,9 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-VCvvPxDWriaeKeRaj/YbPLPfNL7fipGwCydr6K0HMjc=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [ click ];
+  dependencies = [ click ];
 
   nativeCheckInputs = [
     parameterized
@@ -36,14 +33,16 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [
     "moreorless/tests/click.py"
+    "moreorless/tests/combined.py"
     "moreorless/tests/general.py"
     "moreorless/tests/patch.py"
   ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/thatch/moreorless/releases/tag/${src.tag}";
     description = "Wrapper to make difflib.unified_diff more fun to use";
     homepage = "https://github.com/thatch/moreorless/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }