From 6db65f8d0263112d31f9d69be327ae123d3b43b2 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 14 Mar 2020 17:00:41 +0100
Subject: [PATCH] python.pkgs.gitdb2: remove

The two are now the same:
https://github.com/gitpython-developers/gitdb/issues/59
---
 .../python-modules/GitPython/default.nix      |  4 ++--
 .../python-modules/gitdb2/default.nix         | 23 -------------------
 pkgs/top-level/python-packages.nix            |  2 +-
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/python-modules/gitdb2/default.nix

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index be2526ffcd43..59ceeaf90638 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
 
 buildPythonPackage rec {
   version = "3.0.5";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [ nose ] ++ lib.optional isPy27 mock;
-  propagatedBuildInputs = [ gitdb2 ddt ];
+  propagatedBuildInputs = [ gitdb ddt ];
 
   # Tests require a git repo
   doCheck = false;
diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix
deleted file mode 100644
index ff4cc913f034..000000000000
--- a/pkgs/development/python-modules/gitdb2/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, smmap2 }:
-
-buildPythonPackage rec {
-  pname = "gitdb2";
-  version = "2.0.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350";
-  };
-
-  propagatedBuildInputs = [ smmap2 ];
-
-  # Bunch of tests fail because they need an actual git repo
-  doCheck = false;
-
-  meta = {
-    description = "Git Object Database";
-    maintainers = [ ];
-    homepage = https://github.com/gitpython-developers/gitdb;
-    license = lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7bfd27ea3e40..15b45c7bffe8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2770,7 +2770,7 @@ in {
 
   gitdb = callPackage ../development/python-modules/gitdb { };
 
-  gitdb2 = callPackage ../development/python-modules/gitdb2 { };
+  gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
 
   GitPython = callPackage ../development/python-modules/GitPython { };