git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #142789 from veprbl/pr/hggit_py3
commit8b35189751a640c7be76d87c83221ca1bf050891 authorSandro <sandro.jaeckel@gmail.com> dateTue 26 Oct 2021, 23:07 (5 years ago) parentf8a6b3e412d572
4 files changed+45−17
compare with master
unifiedsplit
pkgs/development/python-modules/hg-git/0.8.nix+36 pkgs/development/python-modules/hg-git/default.nix+6−16 pkgs/top-level/python-packages.nix+2 pkgs/top-level/python2-packages.nix+1−1
pkgs/development/python-modules/hg-git/0.8.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, dulwich
5+, isPy3k
6+, fetchpatch
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "hg-git";
11+ version = "0.8.12";
12+ disabled = isPy3k;
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
17+ };
18+
19+ propagatedBuildInputs = [ dulwich ];
20+
21+ # Needs patch to work with Mercurial 4.8
22+ # https://foss.heptapod.net/mercurial/hg-git/-/issues/264
23+ patches = [
24+ (fetchpatch {
25+ url = "https://foss.heptapod.net/mercurial/hg-git/-/commit/186b37af1ff61e8141e9eea5c75a03b3c82f1ab9.diff";
26+ sha256 = "sha256-KS6fUJOVzCYX/r5sdRXuFDKtlgxz80bGDFb71ISnRgc=";
27+ })
28+ ];
29+
30+ meta = with lib; {
31+ description = "Push and pull from a Git server using Mercurial";
32+ homepage = "https://hg-git.github.io/";
33+ maintainers = with maintainers; [ koral ];
34+ license = licenses.gpl2Only;
35+ };
36+}
pkgs/development/python-modules/hg-git/default.nix+6−16
@@ -2,35 +2,25 @@
22, buildPythonPackage
33, fetchPypi
44, dulwich
5−, isPy3k
6−, fetchpatch
5+, mercurial
76}:
87
98buildPythonPackage rec {
109 pname = "hg-git";
11− version = "0.8.12";
12− disabled = isPy3k;
10+ version = "0.10.2";
1311
1412 src = fetchPypi {
1513 inherit pname version;
16− sha256 = "13hbm0ki6s88r6p65ibvrbxnskinzdz0m9gsshb8s571p91ymfjn";
14+ sha256 = "aae1c47328bb7f928778712654c3d5f100445190e2891f175dac66d743fdb2e8";
1715 };
1816
19− propagatedBuildInputs = [ dulwich ];
20−
21− # Needs patch to work with Mercurial 4.8
22− # https://bitbucket.org/durin42/hg-git/issues/264/unexpected-keyword-argument-createopts-hg
23− patches =
24− fetchpatch {
25− url = "https://bitbucket.org/rsalmaso/hg-git/commits/a778506fd4be0bf1afa75755f6ee9260fa234a0f/raw";
26− sha256 = "12r4qzbc5xcqwv0kvf8g4wjji7n45421zkbf6i75vyi4nl6n4j15";
27− };
17+ propagatedBuildInputs = [ dulwich mercurial ];
2818
2919 meta = with lib; {
3020 description = "Push and pull from a Git server using Mercurial";
31− homepage = "http://hg-git.github.com/";
21+ homepage = "https://hg-git.github.io/";
3222 maintainers = with maintainers; [ koral ];
33− license = licenses.gpl2;
23+ license = licenses.gpl2Only;
3424 };
3525
3626}
pkgs/top-level/python-packages.nix+2
@@ -3440,6 +3440,8 @@ in {
34403440
34413441 hg-evolve = callPackage ../development/python-modules/hg-evolve { };
34423442
3443+ hg-git = callPackage ../development/python-modules/hg-git { };
3444+
34433445 hglib = callPackage ../development/python-modules/hglib { };
34443446
34453447 hickle = callPackage ../development/python-modules/hickle { };
pkgs/top-level/python2-packages.nix+1−1
@@ -170,7 +170,7 @@ with self; with super; {
170170 pythonPackages = self;
171171 });
172172
173− hg-git = callPackage ../development/python-modules/hg-git { };
173+ hg-git = callPackage ../development/python-modules/hg-git/0.8.nix { };
174174
175175 hgsvn = callPackage ../development/python-modules/hgsvn { };
176176