From 49a06c00057ca9db11f0f5ab524db88f836481bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Feb 2023 10:26:48 +0100
Subject: [PATCH 1/2] python310Packages.check-manifest: add changelog to meta

---
 pkgs/development/python-modules/check-manifest/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 8a3e328313f9..c06a75f3c67f 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "check-manifest";
-  version = "0.48";
+  version = "0.49";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc=";
+    hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY=";
   };
 
   patches = [
@@ -57,6 +57,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Check MANIFEST.in in a Python source package for completeness";
     homepage = "https://github.com/mgedmin/check-manifest";
+    changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ lewo ];
   };

From 67a00c202463acfef373b9a22d4e65a7174290ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Feb 2023 10:30:55 +0100
Subject: [PATCH 2/2] python310Packages.check-manifest: 0.48 -> 0.49

Changelog: https://github.com/mgedmin/check-manifest/blob/0.49/CHANGES.rst
---
 .../python-modules/check-manifest/default.nix | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index c06a75f3c67f..832cac1f7872 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -3,12 +3,10 @@
 , build
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , git
-, mock
 , pep517
 , pytestCheckHook
-, toml
+, tomli
 , pythonOlder
 }:
 
@@ -17,34 +15,29 @@ buildPythonPackage rec {
   version = "0.49";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ZKZARFVCzyJpGWV8e3jQLZwcpbHCXX5m4OH/MlBg9BY=";
   };
 
-  patches = [
-    # Fix git submodule tests using file: protocol
-    (fetchpatch {
-      url = "https://github.com/mgedmin/check-manifest/pull/159.patch";
-      hash = "sha256-CDtuIoHgP4THLt+xF32C/OrjakwPOEVTKUh5JuQB5wM=";
-    })
-  ];
-
   propagatedBuildInputs = [
     build
     pep517
-    toml
+  ] ++ lib.optionals (pythonOlder "3.11") [
+    tomli
   ];
 
   nativeCheckInputs = [
-    breezy
     git
-    mock
     pytestCheckHook
   ];
 
+  checkInputs = [
+    breezy
+  ];
+
   disabledTests = [
     # Test wants to setup a venv
     "test_build_sdist_pep517_isolated"