From d0207e3152ec1c8c85a7fa0202dfb719f8ac3088 Mon Sep 17 00:00:00 2001
From: Sebastian Wild <sebastian@wild-siena.com>
Date: Sun, 6 Dec 2020 22:38:21 +0100
Subject: [PATCH 1/3] maintainers: add wildsebastian

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3454dc71997..c528bf73074 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9452,6 +9452,16 @@
     githubId = 19174984;
     name = "Alex Whitt";
   };
+  wildsebastian = {
+    name = "Sebastian Wild";
+    email = "sebastian@wild-siena.com";
+    github = "wildsebastian";
+    githubId = 1215623;
+    keys = [{
+      longkeyid = "rsa4096/0x366A2940479A06FC";
+      fingerprint = "DA03 D6C6 3F58 E796 AD26  E99B 366A 2940 479A 06FC";
+    }];
+  };
   willibutz = {
     email = "willibutz@posteo.de";
     github = "willibutz";

From 60651e35e4e3f487a8fcd5a4f57bcff6b4583ebc Mon Sep 17 00:00:00 2001
From: Sebastian Wild <sebastian@wild-siena.com>
Date: Sun, 6 Dec 2020 22:38:21 +0100
Subject: [PATCH 2/3] pythonPackages.patiencediff: init at 0.2.1

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

diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix
new file mode 100644
index 00000000000..921fbe4c431
--- /dev/null
+++ b/pkgs/development/python-modules/patiencediff/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "patiencediff";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0nm2242xgg59l06m54rzxp41aly3lxjh0a1s7h6dk7ryxjh002lv";
+  };
+
+  meta = with lib; {
+    description = "C implementation of patiencediff algorithm for Python";
+    homepage = "https://github.com/breezy-team/patiencediff";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.wildsebastian ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c15b73e65a6..83a15dfb61c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4474,6 +4474,8 @@ in {
 
   pathtools = callPackage ../development/python-modules/pathtools { };
 
+  patiencediff = callPackage ../development/python-modules/patiencediff { };
+
   patool = callPackage ../development/python-modules/patool { };
 
   patsy = callPackage ../development/python-modules/patsy { };

From 598af09d87956e9d3ac288af49fe727c0248766f Mon Sep 17 00:00:00 2001
From: Sebastian Wild <sebastian@wild-siena.com>
Date: Sun, 6 Dec 2020 22:38:21 +0100
Subject: [PATCH 3/3] python3Packages.breezy: fix build

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

diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
index 55fb8deb5fc..21d0b6d9f30 100644
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , configobj
+, patiencediff
 , six
 , fastimport
 , dulwich
@@ -18,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be";
   };
 
-  propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ];
+  propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];
 
   checkInputs = [ testtools ];