From c19e64e43a6f953afaa3e153805cc6c53feaf065 Mon Sep 17 00:00:00 2001
From: graysonhead <grayson@graysonhead.net>
Date: Mon, 4 Apr 2022 20:52:15 +0000
Subject: [PATCH 1/4] python3Package.mergedb: init at 0.1.1

---
 .../python-modules/mergedb/default.nix        | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/mergedb/default.nix

diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix
new file mode 100644
index 000000000000..91216f240fa1
--- /dev/null
+++ b/pkgs/development/python-modules/mergedb/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, colorama
+, fetchPypi
+, jinja2
+, pytestCheckHook
+, pythonOlder
+, pyyaml
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+  pname = "mergedb";
+  version = "0.1.1";
+
+  disabled = pythonOlder "3.7";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2034c18dca23456c5b166b63d94300bcd8ec9f386e6cd639c2f66e141c0313f9";
+  };
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+  propagatedBuildInputs = [
+    pyyaml
+    colorama
+    jinja2
+  ];
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "mergedb" ];
+
+  meta = with lib; {
+    description = "A tool/library for deep merging YAML files";
+    homepage = "https://github.com/graysonhead/mergedb";
+    license = licenses.gpl3Only;
+    maintainers = [ maintainers.graysonhead ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36fe14cb0b57..c224f5b635ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5109,6 +5109,8 @@ in {
     python3Packages = self;
   });
 
+  mergedb = callPackage ../development/python-modules/mergedb { };
+
   mergedeep = callPackage ../development/python-modules/mergedeep { };
 
   merkletools = callPackage ../development/python-modules/merkletools { };

From 204d20c9ef9a9a9a1a356021567ac1e026b3fa7f Mon Sep 17 00:00:00 2001
From: graysonhead <grayson@graysonhead.net>
Date: Tue, 5 Apr 2022 21:28:42 +0000
Subject: [PATCH 2/4] Adding graysonhead to maintainers

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7cae29a1eefe..3412e2e03cc6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4656,6 +4656,12 @@
     githubId = 4656860;
     name = "Gaute Ravndal";
   };
+  graysonhead = {
+    email = "grayson@graysonhead.net";
+    github = "graysonhead";
+    githubId = 6179496;
+    name = "Grayson Head";
+  };
   grburst = {
     email = "GRBurst@protonmail.com";
     github = "GRBurst";

From 16e14a8acb6f9ea4fabdeb0fa9b1c7cda3adf5c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 6 Apr 2022 11:10:06 +0200
Subject: [PATCH 3/4] python3Package.mergedb: add some blank lines

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

diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix
index 91216f240fa1..db8e8f0c088c 100644
--- a/pkgs/development/python-modules/mergedb/default.nix
+++ b/pkgs/development/python-modules/mergedb/default.nix
@@ -12,8 +12,10 @@
 buildPythonPackage rec {
   pname = "mergedb";
   version = "0.1.1";
+  format = "setuptools";
 
   disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "2034c18dca23456c5b166b63d94300bcd8ec9f386e6cd639c2f66e141c0313f9";
@@ -22,22 +24,26 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     setuptools-scm
   ];
+
   propagatedBuildInputs = [
     pyyaml
     colorama
     jinja2
   ];
+
   checkInputs = [
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "mergedb" ];
+  pythonImportsCheck = [
+    "mergedb"
+  ];
 
   meta = with lib; {
     description = "A tool/library for deep merging YAML files";
     homepage = "https://github.com/graysonhead/mergedb";
     license = licenses.gpl3Only;
-    maintainers = [ maintainers.graysonhead ];
+    maintainers = with maintainers; [ graysonhead ];
   };
 }
 

From f0b94551bc083b97559357b17cd49b0a151c8a18 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 6 Apr 2022 11:21:22 +0200
Subject: [PATCH 4/4] python3Package.mergedb: add setuptools

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

diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix
index db8e8f0c088c..b31d4ddf1928 100644
--- a/pkgs/development/python-modules/mergedb/default.nix
+++ b/pkgs/development/python-modules/mergedb/default.nix
@@ -6,6 +6,7 @@
 , pytestCheckHook
 , pythonOlder
 , pyyaml
+, setuptools
 , setuptools-scm
 }:
 
@@ -29,6 +30,7 @@ buildPythonPackage rec {
     pyyaml
     colorama
     jinja2
+    setuptools
   ];
 
   checkInputs = [