Skip to content

Commit 727b2d3

Browse files
committed
git-branchless: directly depends on nix 0.29.0 for LoongArch support
1 parent 23d5c60 commit 727b2d3

File tree

1 file changed

+81
-0
lines changed

1 file changed

+81
-0
lines changed
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
From 9e3a0aa38ac4f32be11e2d7e35337c473068cf2c Mon Sep 17 00:00:00 2001
2+
From: Kexy Biscuit <[email protected]>
3+
Date: Sun, 21 Jul 2024 22:51:15 +0800
4+
Subject: [PATCH] Directly depends on nix 0.29.0 for LoongArch support.
5+
6+
---
7+
Cargo.lock | 23 +++++++++++++++++++++--
8+
git-branchless/Cargo.toml | 1 +
9+
2 files changed, 22 insertions(+), 2 deletions(-)
10+
11+
diff --git a/Cargo.lock b/Cargo.lock
12+
index cf9f2d8..9d43a6f 100644
13+
--- a/Cargo.lock
14+
+++ b/Cargo.lock
15+
@@ -324,6 +324,12 @@ version = "1.0.0"
16+
source = "registry+https://github.com/rust-lang/crates.io-index"
17+
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
18+
19+
+[[package]]
20+
+name = "cfg_aliases"
21+
+version = "0.2.1"
22+
+source = "registry+https://github.com/rust-lang/crates.io-index"
23+
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
24+
+
25+
[[package]]
26+
name = "chashmap"
27+
version = "2.2.2"
28+
@@ -1423,6 +1429,7 @@ dependencies = [
29+
"itertools 0.12.1",
30+
"lazy_static",
31+
"man",
32+
+ "nix 0.29.0",
33+
"num_cpus",
34+
"once_cell",
35+
"path-slash",
36+
@@ -2053,9 +2060,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
37+
38+
[[package]]
39+
name = "libc"
40+
-version = "0.2.153"
41+
+version = "0.2.155"
42+
source = "registry+https://github.com/rust-lang/crates.io-index"
43+
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
44+
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
45+
46+
[[package]]
47+
name = "libgit2-sys"
48+
@@ -2252,6 +2259,18 @@ dependencies = [
49+
"pin-utils",
50+
]
51+
52+
+[[package]]
53+
+name = "nix"
54+
+version = "0.29.0"
55+
+source = "registry+https://github.com/rust-lang/crates.io-index"
56+
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
57+
+dependencies = [
58+
+ "bitflags 2.5.0",
59+
+ "cfg-if",
60+
+ "cfg_aliases",
61+
+ "libc",
62+
+]
63+
+
64+
[[package]]
65+
name = "nu-ansi-term"
66+
version = "0.46.0"
67+
diff --git a/git-branchless/Cargo.toml b/git-branchless/Cargo.toml
68+
index 7bf56e5..a3e49fd 100644
69+
--- a/git-branchless/Cargo.toml
70+
+++ b/git-branchless/Cargo.toml
71+
@@ -43,6 +43,7 @@ itertools = { workspace = true }
72+
lazy_static = { workspace = true }
73+
lib = { workspace = true }
74+
man = { workspace = true }
75+
+nix = "0.29.0"
76+
num_cpus = { workspace = true }
77+
once_cell = { workspace = true }
78+
path-slash = { workspace = true }
79+
--
80+
2.46.0.rc1.windows.1
81+

0 commit comments

Comments
 (0)