pyrox.dev
git-branchless: 0.9.0 -> 0.10.0 & fix build (#342278)
authored by
+13
-5
pkgs/applications/version-management/git-branchless/default.nix
+13
-5
pkgs/applications/version-management/git-branchless/default.nix
···
15
15
16
16
rustPlatform.buildRustPackage rec {
17
17
pname = "git-branchless";
18
-
version = "0.9.0";
18
+
version = "0.10.0";
19
19
20
20
src = fetchFromGitHub {
21
21
owner = "arxanas";
22
22
repo = "git-branchless";
23
23
rev = "v${version}";
24
-
hash = "sha256-4RRSffkAe0/8k4SNnlB1iiaW4gWFTuYXplVBj2aRIdU=";
24
+
hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";
25
25
};
26
26
27
-
cargoHash = "sha256-Jg4d7tJXr2O1sEDdB/zk+7TPBZvgHlmW8mNiXozLKV8=";
27
+
cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8=";
28
28
29
29
nativeBuildInputs = [ pkg-config ];
30
30
···
40
40
libiconv
41
41
];
42
42
43
-
postInstall = ''
43
+
postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) ''
44
44
$out/bin/git-branchless install-man-pages $out/share/man
45
45
'';
46
46
···
48
48
export TEST_GIT=${git}/bin/git
49
49
export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path)
50
50
'';
51
-
# FIXME: these tests deadlock when run in the Nix sandbox
51
+
52
+
# Note that upstream has disabled CI tests for git>=2.46
53
+
# See: https://github.com/arxanas/git-branchless/issues/1416
54
+
# https://github.com/arxanas/git-branchless/pull/1417
55
+
# To be re-enabled once arxanas/git-branchless#1416 is resolved
56
+
doCheck = false;
57
+
52
58
checkFlags = [
59
+
# FIXME: these tests deadlock when run in the Nix sandbox
53
60
"--skip=test_switch_pty"
54
61
"--skip=test_next_ambiguous_interactive"
55
62
"--skip=test_switch_auto_switch_interactive"
···
63
70
maintainers = with maintainers; [
64
71
nh2
65
72
hmenke
73
+
bryango
66
74
];
67
75
};
68
76
}