about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/hg-git/default.nix')
-rw-r--r--nixpkgs/pkgs/development/python-modules/hg-git/default.nix22
1 files changed, 6 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/hg-git/default.nix b/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
index 1d8e1ec1e29f..eccdcdaed422 100644
--- a/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
+++ b/nixpkgs/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.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
+    sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4";
   };
 
-  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;
   };
 
 }