Skip to content

Commit 818e0e5

Browse files
Builditlucalyssais
authored andcommitted
wiki-tui: fix compilation with rust 1.80
1 parent 1bd503a commit 818e0e5

File tree

2 files changed

+217
-2
lines changed

2 files changed

+217
-2
lines changed

pkgs/misc/wiki-tui/default.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ rustPlatform.buildRustPackage rec {
1414

1515
src = fetchFromGitHub {
1616
owner = "Builditluc";
17-
repo = pname;
17+
repo = "wiki-tui";
1818
rev = "v${version}";
1919
hash = "sha256-euyg4wYWYerYT3hKdOCjokx8lJldGN7E3PHimDgQy3U=";
2020
};
2121

22+
# Note: bump `time` dependency to be able to build with rust 1.80, should be removed on the next
23+
# release (see: https://github.com/NixOS/nixpkgs/issues/332957)
24+
cargoPatches = [ ./time.patch ];
25+
2226
nativeBuildInputs = [
2327
pkg-config
2428
];
@@ -30,7 +34,7 @@ rustPlatform.buildRustPackage rec {
3034
Security
3135
];
3236

33-
cargoHash = "sha256-rKTR7vKt8woWAn7XgNYFiWu4KSiZYhaH+PLEIOfbNIY=";
37+
cargoHash = "sha256-XovbT+KC0va7yC5j7kf6t1SnXe1uyy1KI8FRV1AwkS0=";
3438

3539
meta = with lib; {
3640
description = "Simple and easy to use Wikipedia Text User Interface";

pkgs/misc/wiki-tui/time.patch

Lines changed: 211 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,211 @@
1+
diff --git a/Cargo.lock b/Cargo.lock
2+
index e66f0ac..918c3b2 100644
3+
--- a/Cargo.lock
4+
+++ b/Cargo.lock
5+
@@ -318,7 +318,7 @@ dependencies = [
6+
"log",
7+
"num",
8+
"owning_ref",
9+
- "time 0.3.22",
10+
+ "time 0.3.36",
11+
"unicode-segmentation",
12+
"unicode-width",
13+
"xi-unicode",
14+
@@ -344,7 +344,7 @@ dependencies = [
15+
"ident_case",
16+
"proc-macro2",
17+
"quote",
18+
- "syn 2.0.23",
19+
+ "syn 2.0.32",
20+
]
21+
22+
[[package]]
23+
@@ -355,7 +355,16 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
24+
dependencies = [
25+
"darling_core",
26+
"quote",
27+
- "syn 2.0.23",
28+
+ "syn 2.0.32",
29+
+]
30+
+
31+
+[[package]]
32+
+name = "deranged"
33+
+version = "0.3.11"
34+
+source = "registry+https://github.com/rust-lang/crates.io-index"
35+
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
36+
+dependencies = [
37+
+ "powerfmt",
38+
]
39+
40+
[[package]]
41+
@@ -427,7 +436,7 @@ checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f"
42+
dependencies = [
43+
"proc-macro2",
44+
"quote",
45+
- "syn 2.0.23",
46+
+ "syn 2.0.32",
47+
]
48+
49+
[[package]]
50+
@@ -448,7 +457,7 @@ dependencies = [
51+
"darling",
52+
"proc-macro2",
53+
"quote",
54+
- "syn 2.0.23",
55+
+ "syn 2.0.32",
56+
]
57+
58+
[[package]]
59+
@@ -1025,6 +1034,12 @@ dependencies = [
60+
"num-traits",
61+
]
62+
63+
+[[package]]
64+
+name = "num-conv"
65+
+version = "0.1.0"
66+
+source = "registry+https://github.com/rust-lang/crates.io-index"
67+
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
68+
+
69+
[[package]]
70+
name = "num-integer"
71+
version = "0.1.45"
72+
@@ -1129,7 +1144,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
73+
dependencies = [
74+
"proc-macro2",
75+
"quote",
76+
- "syn 2.0.23",
77+
+ "syn 2.0.32",
78+
]
79+
80+
[[package]]
81+
@@ -1282,6 +1297,12 @@ version = "0.3.27"
82+
source = "registry+https://github.com/rust-lang/crates.io-index"
83+
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
84+
85+
+[[package]]
86+
+name = "powerfmt"
87+
+version = "0.2.0"
88+
+source = "registry+https://github.com/rust-lang/crates.io-index"
89+
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
90+
+
91+
[[package]]
92+
name = "ppv-lite86"
93+
version = "0.2.17"
94+
@@ -1518,9 +1539,9 @@ dependencies = [
95+
96+
[[package]]
97+
name = "serde"
98+
-version = "1.0.167"
99+
+version = "1.0.193"
100+
source = "registry+https://github.com/rust-lang/crates.io-index"
101+
-checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237"
102+
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
103+
dependencies = [
104+
"serde_derive",
105+
]
106+
@@ -1537,13 +1558,13 @@ dependencies = [
107+
108+
[[package]]
109+
name = "serde_derive"
110+
-version = "1.0.167"
111+
+version = "1.0.193"
112+
source = "registry+https://github.com/rust-lang/crates.io-index"
113+
-checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9"
114+
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
115+
dependencies = [
116+
"proc-macro2",
117+
"quote",
118+
- "syn 2.0.23",
119+
+ "syn 2.0.32",
120+
]
121+
122+
[[package]]
123+
@@ -1565,7 +1586,7 @@ checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731"
124+
dependencies = [
125+
"proc-macro2",
126+
"quote",
127+
- "syn 2.0.23",
128+
+ "syn 2.0.32",
129+
]
130+
131+
[[package]]
132+
@@ -1750,9 +1771,9 @@ dependencies = [
133+
134+
[[package]]
135+
name = "syn"
136+
-version = "2.0.23"
137+
+version = "2.0.32"
138+
source = "registry+https://github.com/rust-lang/crates.io-index"
139+
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
140+
+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
141+
dependencies = [
142+
"proc-macro2",
143+
"quote",
144+
@@ -1832,7 +1853,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
145+
dependencies = [
146+
"proc-macro2",
147+
"quote",
148+
- "syn 2.0.23",
149+
+ "syn 2.0.32",
150+
]
151+
152+
[[package]]
153+
@@ -1859,13 +1880,16 @@ dependencies = [
154+
155+
[[package]]
156+
name = "time"
157+
-version = "0.3.22"
158+
+version = "0.3.36"
159+
source = "registry+https://github.com/rust-lang/crates.io-index"
160+
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
161+
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
162+
dependencies = [
163+
+ "deranged",
164+
"itoa",
165+
"libc",
166+
+ "num-conv",
167+
"num_threads",
168+
+ "powerfmt",
169+
"serde",
170+
"time-core",
171+
"time-macros",
172+
@@ -1873,16 +1897,17 @@ dependencies = [
173+
174+
[[package]]
175+
name = "time-core"
176+
-version = "0.1.1"
177+
+version = "0.1.2"
178+
source = "registry+https://github.com/rust-lang/crates.io-index"
179+
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
180+
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
181+
182+
[[package]]
183+
name = "time-macros"
184+
-version = "0.2.9"
185+
+version = "0.2.18"
186+
source = "registry+https://github.com/rust-lang/crates.io-index"
187+
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
188+
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
189+
dependencies = [
190+
+ "num-conv",
191+
"time-core",
192+
]
193+
194+
@@ -2133,7 +2158,7 @@ dependencies = [
195+
"once_cell",
196+
"proc-macro2",
197+
"quote",
198+
- "syn 2.0.23",
199+
+ "syn 2.0.32",
200+
"wasm-bindgen-shared",
201+
]
202+
203+
@@ -2167,7 +2192,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
204+
dependencies = [
205+
"proc-macro2",
206+
"quote",
207+
- "syn 2.0.23",
208+
+ "syn 2.0.32",
209+
"wasm-bindgen-backend",
210+
"wasm-bindgen-shared",
211+
]

0 commit comments

Comments
 (0)