mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Merge pull request #142789 from veprbl/pr/hggit_py3

Browse source
This commit is contained in:
Sandro 2021-10-26 23:07:27 +02:00 committed by GitHub
parent f8a6b3eb85 412d572942
commit 8b35189751
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/development/python-modules/hg-git/0.8.nix Normal file
View file

@ -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;
};
}

22
pkgs/development/python-modules/hg-git/default.nix
View file

@ -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;
};
}

2
pkgs/top-level/python-packages.nix
View file

@ -3440,6 +3440,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 { };

2
pkgs/top-level/python2-packages.nix
View file

@ -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 { };