hg-git: move to python-packages, enable tests

NixOS · Sep 5, 2021 · 77a6477 · 77a6477
1 parent 75e8251
commit 77a6477
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 { };