From 412d5729429c8413dc26f9eea2dd2e8e21002ba1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 24 Oct 2021 17:30:07 -0400
Subject: [PATCH] python3Packages.hg-git: init at 0.10.2

---
 .../development/python-modules/hg-git/0.8.nix | 36 +++++++++++++++++++
 .../python-modules/hg-git/default.nix         | 22 ++++--------
 pkgs/top-level/python-packages.nix            |  2 ++
 pkgs/top-level/python2-packages.nix           |  2 +-
 4 files changed, 45 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/hg-git/0.8.nix

diff --git a/pkgs/development/python-modules/hg-git/0.8.nix b/pkgs/development/python-modules/hg-git/0.8.nix
new file mode 100644
index 000000000000..b3bfdf708244
--- /dev/null
+++ b/pkgs/development/python-modules/hg-git/0.8.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, dulwich
+, isPy3k
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+  pname = "hg-git";
+  version = "0.8.12";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
+  };
+
+  propagatedBuildInputs = [ dulwich ];
+
+  # Needs patch to work with Mercurial 4.8
+  # https://foss.heptapod.net/mercurial/hg-git/-/issues/264
+  patches = [
+    (fetchpatch {
+      url = "https://foss.heptapod.net/mercurial/hg-git/-/commit/186b37af1ff61e8141e9eea5c75a03b3c82f1ab9.diff";
+      sha256 = "sha256-KS6fUJOVzCYX/r5sdRXuFDKtlgxz80bGDFb71ISnRgc=";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Push and pull from a Git server using Mercurial";
+    homepage = "https://hg-git.github.io/";
+    maintainers = with maintainers; [ koral ];
+    license = licenses.gpl2Only;
+  };
+}
diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
index 1d8e1ec1e29f..69756083e5d8 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -2,35 +2,25 @@
 , buildPythonPackage
 , fetchPypi
 , dulwich
-, isPy3k
-, fetchpatch
+, mercurial
 }:
 
 buildPythonPackage rec {
   pname = "hg-git";
-  version = "0.8.12";
-  disabled = isPy3k;
+  version = "0.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
+    sha256 = "aae1c47328bb7f928778712654c3d5f100445190e2891f175dac66d743fdb2e8";
   };
 
-  propagatedBuildInputs = [ dulwich ];
-
-  # Needs patch to work with Mercurial 4.8
-  # https://bitbucket.org/durin42/hg-git/issues/264/unexpected-keyword-argument-createopts-hg
-  patches =
-    fetchpatch {
-      url = "https://bitbucket.org/rsalmaso/hg-git/commits/a778506fd4be0bf1afa75755f6ee9260fa234a0f/raw";
-      sha256 = "12r4qzbc5xcqwv0kvf8g4wjji7n45421zkbf6i75vyi4nl6n4j15";
-    };
+  propagatedBuildInputs = [ dulwich mercurial ];
 
   meta = with lib; {
     description = "Push and pull from a Git server using Mercurial";
-    homepage = "http://hg-git.github.com/";
+    homepage = "https://hg-git.github.io/";
     maintainers = with maintainers; [ koral ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
   };
 
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d9c1ffc0d4a..5c9081589814 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3434,6 +3434,8 @@ in {
 
   hg-evolve = callPackage ../development/python-modules/hg-evolve { };
 
+  hg-git = callPackage ../development/python-modules/hg-git { };
+
   hglib = callPackage ../development/python-modules/hglib { };
 
   hickle = callPackage ../development/python-modules/hickle { };
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 334e86a9d5b2..927827b66e50 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -170,7 +170,7 @@ with self; with super; {
     pythonPackages = self;
   });
 
-  hg-git = callPackage ../development/python-modules/hg-git { };
+  hg-git = callPackage ../development/python-modules/hg-git/0.8.nix { };
 
   hgsvn = callPackage ../development/python-modules/hgsvn { };