From 77a6477b9d7492992dd2f5c70a43c6a830aaa697 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 5 Sep 2021 10:31:35 +0000
Subject: [PATCH] hg-git: move to python-packages, enable tests

---
 pkgs/development/python-modules/hg-git/default.nix | 5 ++---
 pkgs/top-level/python-packages.nix                 | 2 ++
 pkgs/top-level/python2-packages.nix                | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix
index 9355793da625bf..06ee447478ada0 100644
--- a/pkgs/development/python-modules/hg-git/default.nix
+++ b/pkgs/development/python-modules/hg-git/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , dulwich
 , brotli
+, mercurial
 }:
 
 buildPythonPackage rec {
@@ -16,9 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ dulwich brotli ];
 
-  # circular dependency, tests need mercurial to be installed, but hg-git is a
-  # dependency of nixpkgs' mercurial package.
-  doCheck = false;
+  checkInputs = [ mercurial ];
 
   meta = with lib; {
     description = "Push and pull from a Git server using Mercurial";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7bf364e8bf999..277a1409ba9f90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3321,6 +3321,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 caa44e5947e156..0f5e22049ad4c7 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -162,8 +162,6 @@ with self; with super; {
     pythonPackages = self;
   });
 
-  hg-git = callPackage ../development/python-modules/hg-git { };
-
   hgsvn = callPackage ../development/python-modules/hgsvn { };
 
   hsaudiotag = callPackage ../development/python-modules/hsaudiotag { };