Skip to content

Commit b1657a4

Browse files
authored
dim: 0-unstable-2023-12-29 -> 0-unstable-2025-09-21 (NixOS#465816)
2 parents 4a52753 + e997030 commit b1657a4

File tree

4 files changed

+81
-227
lines changed

4 files changed

+81
-227
lines changed
Lines changed: 43 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,20 @@
1+
From f65f27f0051f5dfa7a57d3ac0bb276828261ed73 Mon Sep 17 00:00:00 2001
2+
From: Michael Daniels <mdaniels5757@gmail.com>
3+
Date: Thu, 27 Nov 2025 22:10:13 -0500
4+
Subject: [PATCH] bump nightfall from 0.3.12-rc4 to 878f07edd5d2c
5+
6+
---
7+
Cargo.lock | 27 +++++++++++++--------------
8+
dim-core/Cargo.toml | 2 +-
9+
dim-web/Cargo.toml | 2 +-
10+
dim/Cargo.toml | 2 +-
11+
4 files changed, 16 insertions(+), 17 deletions(-)
12+
113
diff --git a/Cargo.lock b/Cargo.lock
2-
index adb78aa..5634132 100644
14+
index 51898150..6cb1d29f 100644
315
--- a/Cargo.lock
416
+++ b/Cargo.lock
5-
@@ -1,6 +1,6 @@
6-
# This file is automatically @generated by Cargo.
7-
# It is not intended for manual editing.
8-
-version = 3
9-
+version = 4
10-
11-
[[package]]
12-
name = "addr2line"
13-
@@ -58,7 +58,7 @@ version = "0.7.7"
14-
source = "registry+https://github.com/rust-lang/crates.io-index"
15-
checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
16-
dependencies = [
17-
- "getrandom",
18-
+ "getrandom 0.2.11",
19-
"once_cell",
20-
"version_check",
21-
]
22-
@@ -979,7 +979,7 @@ dependencies = [
23-
"tracing-appender",
24-
"tracing-subscriber",
25-
"url",
26-
- "uuid 1.5.0",
27-
+ "uuid 1.16.0",
28-
"xmlwriter",
29-
"xtra",
30-
"zip",
31-
@@ -1079,7 +1079,7 @@ dependencies = [
32-
"tracing",
33-
"tracing-appender",
34-
"tracing-subscriber",
35-
- "uuid 1.5.0",
36-
+ "uuid 1.16.0",
37-
]
38-
39-
[[package]]
40-
@@ -1411,6 +1411,18 @@ dependencies = [
41-
"wasi 0.11.0+wasi-snapshot-preview1",
42-
]
43-
44-
+[[package]]
45-
+name = "getrandom"
46-
+version = "0.3.3"
47-
+source = "registry+https://github.com/rust-lang/crates.io-index"
48-
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
49-
+dependencies = [
50-
+ "cfg-if",
51-
+ "libc",
52-
+ "r-efi",
53-
+ "wasi 0.14.2+wasi-0.2.4",
54-
+]
55-
+
56-
[[package]]
57-
name = "ghash"
58-
version = "0.4.4"
59-
@@ -1874,9 +1886,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
60-
61-
[[package]]
62-
name = "libc"
63-
-version = "0.2.150"
64-
+version = "0.2.172"
65-
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
67-
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
68-
69-
[[package]]
70-
name = "libsqlite3-sys"
71-
@@ -2049,14 +2061,14 @@ dependencies = [
17+
@@ -2268,14 +2268,14 @@ dependencies = [
7218
[[package]]
7319
name = "nightfall"
7420
version = "0.3.12-rc4"
@@ -85,16 +31,16 @@ index adb78aa..5634132 100644
8531
"ntapi",
8632
"once_cell",
8733
"psutil",
88-
@@ -2067,7 +2079,7 @@ dependencies = [
34+
@@ -2286,7 +2286,7 @@ dependencies = [
8935
"tokio",
9036
"tokio-stream",
9137
"tracing",
9238
- "uuid 0.8.2",
93-
+ "uuid 1.16.0",
39+
+ "uuid 1.18.1",
9440
"winapi",
9541
"xtra",
9642
"xtra_proc",
97-
@@ -2075,27 +2087,26 @@ dependencies = [
43+
@@ -2294,36 +2294,35 @@ dependencies = [
9844

9945
[[package]]
10046
name = "nix"
@@ -108,27 +54,38 @@ index adb78aa..5634132 100644
10854
"cc",
10955
"cfg-if",
11056
"libc",
111-
+ "memoffset 0.6.5",
57+
+ "memoffset",
11258
]
11359

11460
[[package]]
11561
name = "nix"
11662
-version = "0.23.2"
117-
+version = "0.27.1"
63+
+version = "0.24.3"
11864
source = "registry+https://github.com/rust-lang/crates.io-index"
11965
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
120-
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
66+
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
12167
dependencies = [
122-
- "bitflags 1.3.2",
68+
"bitflags 1.3.2",
12369
- "cc",
124-
+ "bitflags 2.4.1",
12570
"cfg-if",
12671
"libc",
127-
- "memoffset 0.6.5",
72+
- "memoffset",
12873
]
12974

13075
[[package]]
131-
@@ -2140,9 +2151,9 @@ dependencies = [
76+
name = "nix"
77+
-version = "0.24.3"
78+
+version = "0.27.1"
79+
source = "registry+https://github.com/rust-lang/crates.io-index"
80+
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
81+
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
82+
dependencies = [
83+
- "bitflags 1.3.2",
84+
+ "bitflags 2.9.4",
85+
"cfg-if",
86+
"libc",
87+
]
88+
@@ -2370,9 +2369,9 @@ dependencies = [
13289

13390
[[package]]
13491
name = "ntapi"
@@ -140,104 +97,11 @@ index adb78aa..5634132 100644
14097
dependencies = [
14198
"winapi",
14299
]
143-
@@ -2481,6 +2492,12 @@ dependencies = [
144-
"proc-macro2",
145-
]
146-
147-
+[[package]]
148-
+name = "r-efi"
149-
+version = "5.2.0"
150-
+source = "registry+https://github.com/rust-lang/crates.io-index"
151-
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
152-
+
153-
[[package]]
154-
name = "rand"
155-
version = "0.8.5"
156-
@@ -2508,7 +2525,7 @@ version = "0.6.4"
157-
source = "registry+https://github.com/rust-lang/crates.io-index"
158-
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
159-
dependencies = [
160-
- "getrandom",
161-
+ "getrandom 0.2.11",
162-
]
163-
164-
[[package]]
165-
@@ -2689,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
166-
checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
167-
dependencies = [
168-
"cc",
169-
- "getrandom",
170-
+ "getrandom 0.2.11",
171-
"libc",
172-
"spin 0.9.8",
173-
"untrusted 0.9.0",
174-
@@ -3505,7 +3522,7 @@ dependencies = [
175-
"tower-layer",
176-
"tower-service",
177-
"tracing",
178-
- "uuid 1.5.0",
179-
+ "uuid 1.16.0",
180-
]
181-
182-
[[package]]
183-
@@ -3742,16 +3759,16 @@ version = "0.8.2"
184-
source = "registry+https://github.com/rust-lang/crates.io-index"
185-
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
186-
dependencies = [
187-
- "getrandom",
188-
+ "getrandom 0.2.11",
189-
]
190-
191-
[[package]]
192-
name = "uuid"
193-
-version = "1.5.0"
194-
+version = "1.16.0"
195-
source = "registry+https://github.com/rust-lang/crates.io-index"
196-
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
197-
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
198-
dependencies = [
199-
- "getrandom",
200-
+ "getrandom 0.3.3",
201-
]
202-
203-
[[package]]
204-
@@ -3803,6 +3820,15 @@ version = "0.11.0+wasi-snapshot-preview1"
205-
source = "registry+https://github.com/rust-lang/crates.io-index"
206-
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
207-
208-
+[[package]]
209-
+name = "wasi"
210-
+version = "0.14.2+wasi-0.2.4"
211-
+source = "registry+https://github.com/rust-lang/crates.io-index"
212-
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
213-
+dependencies = [
214-
+ "wit-bindgen-rt",
215-
+]
216-
+
217-
[[package]]
218-
name = "wasm-bindgen"
219-
version = "0.2.88"
220-
@@ -4092,6 +4118,15 @@ dependencies = [
221-
"windows-sys 0.48.0",
222-
]
223-
224-
+[[package]]
225-
+name = "wit-bindgen-rt"
226-
+version = "0.39.0"
227-
+source = "registry+https://github.com/rust-lang/crates.io-index"
228-
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
229-
+dependencies = [
230-
+ "bitflags 2.4.1",
231-
+]
232-
+
233-
[[package]]
234-
name = "xmlwriter"
235-
version = "0.1.0"
236100
diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml
237-
index b311b7c..ffc5d85 100644
101+
index cf30e509..fd460ff2 100644
238102
--- a/dim-core/Cargo.toml
239103
+++ b/dim-core/Cargo.toml
240-
@@ -11,7 +11,7 @@ vaapi = ["nightfall/vaapi"]
104+
@@ -14,7 +14,7 @@ embed_ui = []
241105

242106
[dependencies]
243107
# git dependencies
@@ -246,20 +110,11 @@ index b311b7c..ffc5d85 100644
246110
"cuda",
247111
"ssa_transmux",
248112
] }
249-
@@ -72,7 +72,7 @@ tracing-subscriber = { version = "^0.3.10", features = [
250-
"json",
251-
] }
252-
url = "2.2.2"
253-
-uuid = { version = "1.2.2", features = ["v4"] }
254-
+uuid = { version = "1.6.1", features = ["v4"] }
255-
xmlwriter = "0.1.0"
256-
xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
257-
258113
diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml
259-
index 2da5764..4c7574c 100644
114+
index 1dbb23ce..f3d84933 100644
260115
--- a/dim-web/Cargo.toml
261116
+++ b/dim-web/Cargo.toml
262-
@@ -14,7 +14,7 @@ dim-utils = { path = "../dim-utils" }
117+
@@ -13,7 +13,7 @@ dim-utils = { path = "../dim-utils" }
263118
dim-events = { path = "../dim-events" }
264119
dim-core = { path = "../dim-core" }
265120

@@ -269,7 +124,7 @@ index 2da5764..4c7574c 100644
269124
"ssa_transmux",
270125
] }
271126
diff --git a/dim/Cargo.toml b/dim/Cargo.toml
272-
index b7c8106..38518ba 100644
127+
index d0fa7917..ab719bce 100644
273128
--- a/dim/Cargo.toml
274129
+++ b/dim/Cargo.toml
275130
@@ -15,7 +15,7 @@ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
@@ -281,3 +136,6 @@ index b7c8106..38518ba 100644
281136
"cuda",
282137
"ssa_transmux",
283138
] }
139+
--
140+
2.50.1
141+

0 commit comments

Comments
 (0)