Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b66dad7

Browse files
authoredSep 23, 2024
boilr: run nixfmt; fix build (#343286)
2 parents 6c38568 + 5a44a67 commit b66dad7

File tree

2 files changed

+312
-18
lines changed

2 files changed

+312
-18
lines changed
 
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,287 @@
1+
From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001
2+
From: wxt <3264117476@qq.com>
3+
Date: Mon, 23 Sep 2024 15:11:09 +0800
4+
Subject: [PATCH] update time
5+
6+
---
7+
Cargo.lock | 87 +++++++++++++++++++++++++++++++++++-------------------
8+
1 file changed, 56 insertions(+), 31 deletions(-)
9+
10+
diff --git a/Cargo.lock b/Cargo.lock
11+
index be4fbeb..42f29b8 100644
12+
--- a/Cargo.lock
13+
+++ b/Cargo.lock
14+
@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
15+
dependencies = [
16+
"proc-macro2",
17+
"quote",
18+
- "syn 2.0.16",
19+
+ "syn 2.0.77",
20+
]
21+
22+
[[package]]
23+
@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
24+
dependencies = [
25+
"proc-macro2",
26+
"quote",
27+
- "syn 2.0.16",
28+
+ "syn 2.0.77",
29+
]
30+
31+
[[package]]
32+
@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
33+
dependencies = [
34+
"proc-macro2",
35+
"quote",
36+
- "syn 2.0.16",
37+
+ "syn 2.0.77",
38+
]
39+
40+
[[package]]
41+
@@ -809,6 +809,15 @@ dependencies = [
42+
"serde",
43+
]
44+
45+
+[[package]]
46+
+name = "deranged"
47+
+version = "0.3.11"
48+
+source = "registry+https://github.com/rust-lang/crates.io-index"
49+
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
50+
+dependencies = [
51+
+ "powerfmt",
52+
+]
53+
+
54+
[[package]]
55+
name = "derivative"
56+
version = "2.2.0"
57+
@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
58+
dependencies = [
59+
"proc-macro2",
60+
"quote",
61+
- "syn 2.0.16",
62+
+ "syn 2.0.77",
63+
]
64+
65+
[[package]]
66+
@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
67+
dependencies = [
68+
"proc-macro2",
69+
"quote",
70+
- "syn 2.0.16",
71+
+ "syn 2.0.77",
72+
]
73+
74+
[[package]]
75+
@@ -2002,6 +2011,12 @@ dependencies = [
76+
"winapi",
77+
]
78+
79+
+[[package]]
80+
+name = "num-conv"
81+
+version = "0.1.0"
82+
+source = "registry+https://github.com/rust-lang/crates.io-index"
83+
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
84+
+
85+
[[package]]
86+
name = "num-integer"
87+
version = "0.1.45"
88+
@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
89+
dependencies = [
90+
"proc-macro2",
91+
"quote",
92+
- "syn 2.0.16",
93+
+ "syn 2.0.77",
94+
]
95+
96+
[[package]]
97+
@@ -2308,7 +2323,7 @@ dependencies = [
98+
"pest_meta",
99+
"proc-macro2",
100+
"quote",
101+
- "syn 2.0.16",
102+
+ "syn 2.0.77",
103+
]
104+
105+
[[package]]
106+
@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
107+
dependencies = [
108+
"proc-macro2",
109+
"quote",
110+
- "syn 2.0.16",
111+
+ "syn 2.0.77",
112+
]
113+
114+
[[package]]
115+
@@ -2389,6 +2404,12 @@ dependencies = [
116+
"windows-sys 0.48.0",
117+
]
118+
119+
+[[package]]
120+
+name = "powerfmt"
121+
+version = "0.2.0"
122+
+source = "registry+https://github.com/rust-lang/crates.io-index"
123+
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
124+
+
125+
[[package]]
126+
name = "ppv-lite86"
127+
version = "0.2.17"
128+
@@ -2407,9 +2428,9 @@ dependencies = [
129+
130+
[[package]]
131+
name = "proc-macro2"
132+
-version = "1.0.57"
133+
+version = "1.0.86"
134+
source = "registry+https://github.com/rust-lang/crates.io-index"
135+
-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16"
136+
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
137+
dependencies = [
138+
"unicode-ident",
139+
]
140+
@@ -2425,9 +2446,9 @@ dependencies = [
141+
142+
[[package]]
143+
name = "quote"
144+
-version = "1.0.27"
145+
+version = "1.0.37"
146+
source = "registry+https://github.com/rust-lang/crates.io-index"
147+
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
148+
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
149+
dependencies = [
150+
"proc-macro2",
151+
]
152+
@@ -2711,22 +2732,22 @@ dependencies = [
153+
154+
[[package]]
155+
name = "serde"
156+
-version = "1.0.163"
157+
+version = "1.0.210"
158+
source = "registry+https://github.com/rust-lang/crates.io-index"
159+
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
160+
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
161+
dependencies = [
162+
"serde_derive",
163+
]
164+
165+
[[package]]
166+
name = "serde_derive"
167+
-version = "1.0.163"
168+
+version = "1.0.210"
169+
source = "registry+https://github.com/rust-lang/crates.io-index"
170+
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
171+
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
172+
dependencies = [
173+
"proc-macro2",
174+
"quote",
175+
- "syn 2.0.16",
176+
+ "syn 2.0.77",
177+
]
178+
179+
[[package]]
180+
@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
181+
dependencies = [
182+
"proc-macro2",
183+
"quote",
184+
- "syn 2.0.16",
185+
+ "syn 2.0.77",
186+
]
187+
188+
[[package]]
189+
@@ -2981,9 +3002,9 @@ dependencies = [
190+
191+
[[package]]
192+
name = "syn"
193+
-version = "2.0.16"
194+
+version = "2.0.77"
195+
source = "registry+https://github.com/rust-lang/crates.io-index"
196+
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
197+
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
198+
dependencies = [
199+
"proc-macro2",
200+
"quote",
201+
@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
202+
dependencies = [
203+
"proc-macro2",
204+
"quote",
205+
- "syn 2.0.16",
206+
+ "syn 2.0.77",
207+
]
208+
209+
[[package]]
210+
@@ -3061,11 +3082,14 @@ dependencies = [
211+
212+
[[package]]
213+
name = "time"
214+
-version = "0.3.21"
215+
+version = "0.3.36"
216+
source = "registry+https://github.com/rust-lang/crates.io-index"
217+
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
218+
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
219+
dependencies = [
220+
+ "deranged",
221+
"itoa",
222+
+ "num-conv",
223+
+ "powerfmt",
224+
"serde",
225+
"time-core",
226+
"time-macros",
227+
@@ -3073,16 +3097,17 @@ dependencies = [
228+
229+
[[package]]
230+
name = "time-core"
231+
-version = "0.1.1"
232+
+version = "0.1.2"
233+
source = "registry+https://github.com/rust-lang/crates.io-index"
234+
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
235+
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
236+
237+
[[package]]
238+
name = "time-macros"
239+
-version = "0.2.9"
240+
+version = "0.2.18"
241+
source = "registry+https://github.com/rust-lang/crates.io-index"
242+
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
243+
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
244+
dependencies = [
245+
+ "num-conv",
246+
"time-core",
247+
]
248+
249+
@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
250+
dependencies = [
251+
"proc-macro2",
252+
"quote",
253+
- "syn 2.0.16",
254+
+ "syn 2.0.77",
255+
]
256+
257+
[[package]]
258+
@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
259+
dependencies = [
260+
"proc-macro2",
261+
"quote",
262+
- "syn 2.0.16",
263+
+ "syn 2.0.77",
264+
]
265+
266+
[[package]]
267+
@@ -3443,7 +3468,7 @@ dependencies = [
268+
"once_cell",
269+
"proc-macro2",
270+
"quote",
271+
- "syn 2.0.16",
272+
+ "syn 2.0.77",
273+
"wasm-bindgen-shared",
274+
]
275+
276+
@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
277+
dependencies = [
278+
"proc-macro2",
279+
"quote",
280+
- "syn 2.0.16",
281+
+ "syn 2.0.77",
282+
"wasm-bindgen-backend",
283+
"wasm-bindgen-shared",
284+
]
285+
--
286+
2.46.0
287+

‎pkgs/by-name/bo/boilr/package.nix

+25-18
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
{ lib
2-
, stdenv
3-
, fetchFromGitHub
4-
, rustPlatform
5-
, clangStdenv
6-
, gtk3
7-
, xorg
8-
, perl
9-
, openssl
10-
, speechd-minimal
11-
, libxkbcommon
12-
, libGL
13-
, wayland
1+
{
2+
lib,
3+
stdenv,
4+
fetchFromGitHub,
5+
rustPlatform,
6+
clangStdenv,
7+
gtk3,
8+
xorg,
9+
perl,
10+
openssl,
11+
speechd-minimal,
12+
libxkbcommon,
13+
libGL,
14+
wayland,
1415
}:
1516
let
1617
rpathLibs = [
@@ -38,11 +39,15 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
3839
src = fetchFromGitHub {
3940
owner = "PhilipK";
4041
repo = "BoilR";
41-
rev = "v.${version}";
42+
rev = "refs/tags/v.${version}";
4243
hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80=";
4344
};
4445

45-
cargoHash = "sha256-nAZU1xVpeRXubotla4I6InGMH4lisPMOnoqaK5mBPCM=";
46+
cargoPatches = [
47+
./0001-update-time.patch
48+
];
49+
50+
cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs=";
4651

4752
nativeBuildInputs = [ perl ];
4853

@@ -57,10 +62,12 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
5762
dontPatchELF = true;
5863

5964
meta = {
60-
description =
61-
"Automatically adds (almost) all your games to your Steam library (including image art)";
65+
description = "Automatically adds (almost) all your games to your Steam library (including image art)";
6266
homepage = "https://github.com/PhilipK/BoilR";
63-
license = with lib.licenses; [ asl20 mit ];
67+
license = with lib.licenses; [
68+
asl20
69+
mit
70+
];
6471
platforms = lib.platforms.linux;
6572
maintainers = with lib.maintainers; [ foolnotion ];
6673
mainProgram = "boilr";

0 commit comments

Comments
 (0)
Please sign in to comment.