Skip to content

Commit f3b1906

Browse files
domenkozarclaude
domenkozar
and
claude
committed
fix: switch iocraft to cachix branch with deterministic element keys
The iocraft element! macro used Uuid::new_v4() for declaration keys, producing non-deterministic proc macro output. This caused nix build failures (E0463) when mixing cached and locally built crates, because rlib metadata differed across compilations. Also fixes duplicate attribute definitions in nix/crate-config.nix. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 4f5c627 commit f3b1906

4 files changed

Lines changed: 27 additions & 33 deletions

File tree

‎Cargo.lock‎

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.nix‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8209,7 +8209,7 @@ rec {
82098209
}
82108210
{
82118211
name = "windows-sys";
8212-
packageId = "windows-sys 0.52.0";
8212+
packageId = "windows-sys 0.59.0";
82138213
target = { target, features }: (target."windows" or false);
82148214
features = [ "Win32_Foundation" "Win32_System_Diagnostics_Debug" ];
82158215
}
@@ -8452,7 +8452,7 @@ rec {
84528452
}
84538453
{
84548454
name = "windows-sys";
8455-
packageId = "windows-sys 0.52.0";
8455+
packageId = "windows-sys 0.59.0";
84568456
target = { target, features }: (target."windows" or false);
84578457
features = [ "Win32_Foundation" "Win32_Storage_FileSystem" "Win32_System_IO" ];
84588458
}
@@ -13421,8 +13421,8 @@ rec {
1342113421
workspace_member = null;
1342213422
src = pkgs.fetchgit {
1342313423
url = "https://github.com/cachix/iocraft";
13424-
rev = "5e6ca047b2b6ec1918b6542c75175d65aeb79ae8";
13425-
sha256 = "1mygsp7xyyrfvfhmvzc8svrd71aglnj4bcamb8r7ibk62ndp9fyz";
13424+
rev = "ca24572778a0ba617f0d9c5e7bc4faa3b6024d61";
13425+
sha256 = "15dds82xy7z0dmbiqxnzb1205nqmv1yfiy5hpl4skcqrna9lb9iz";
1342613426
};
1342713427
dependencies = [
1342813428
{
@@ -13468,8 +13468,8 @@ rec {
1346813468
workspace_member = null;
1346913469
src = pkgs.fetchgit {
1347013470
url = "https://github.com/cachix/iocraft";
13471-
rev = "5e6ca047b2b6ec1918b6542c75175d65aeb79ae8";
13472-
sha256 = "1mygsp7xyyrfvfhmvzc8svrd71aglnj4bcamb8r7ibk62ndp9fyz";
13471+
rev = "ca24572778a0ba617f0d9c5e7bc4faa3b6024d61";
13472+
sha256 = "15dds82xy7z0dmbiqxnzb1205nqmv1yfiy5hpl4skcqrna9lb9iz";
1347313473
};
1347413474
procMacro = true;
1347513475
libName = "iocraft_macros";
@@ -13487,11 +13487,6 @@ rec {
1348713487
packageId = "syn 2.0.117";
1348813488
features = [ "full" ];
1348913489
}
13490-
{
13491-
name = "uuid";
13492-
packageId = "uuid";
13493-
features = [ "v4" ];
13494-
}
1349513490
];
1349613491

1349713492
};
@@ -13712,7 +13707,7 @@ rec {
1371213707
}
1371313708
{
1371413709
name = "windows-sys";
13715-
packageId = "windows-sys 0.52.0";
13710+
packageId = "windows-sys 0.59.0";
1371613711
optional = true;
1371713712
usesDefaultFeatures = false;
1371813713
target = { target, features }: (target."windows" or false);
@@ -19574,7 +19569,7 @@ rec {
1957419569
}
1957519570
{
1957619571
name = "windows-sys";
19577-
packageId = "windows-sys 0.52.0";
19572+
packageId = "windows-sys 0.59.0";
1957819573
target = { target, features }: (target."windows" or false);
1957919574
features = [ "Win32_Foundation" "Win32_System_IO" "Win32_Networking_WinSock" ];
1958019575
}
@@ -21622,7 +21617,7 @@ rec {
2162221617
}
2162321618
{
2162421619
name = "windows-sys";
21625-
packageId = "windows-sys 0.52.0";
21620+
packageId = "windows-sys 0.59.0";
2162621621
target = { target, features }: (target."windows" or false);
2162721622
features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_NetworkManagement_IpHelper" "Win32_System_Threading" ];
2162821623
}
@@ -21733,7 +21728,7 @@ rec {
2173321728
}
2173421729
{
2173521730
name = "windows-sys";
21736-
packageId = "windows-sys 0.52.0";
21731+
packageId = "windows-sys 0.59.0";
2173721732
target = { target, features }: (target."windows" or false);
2173821733
features = [ "Win32_Foundation" "Win32_Networking_WinSock" ];
2173921734
}
@@ -22065,7 +22060,7 @@ rec {
2206522060
}
2206622061
{
2206722062
name = "windows-sys";
22068-
packageId = "windows-sys 0.52.0";
22063+
packageId = "windows-sys 0.59.0";
2206922064
usesDefaultFeatures = false;
2207022065
target = { target, features }: (target."windows" or false);
2207122066
features = [ "Win32_Foundation" "Win32_Security_Cryptography" ];
@@ -27075,7 +27070,7 @@ rec {
2707527070
}
2707627071
{
2707727072
name = "windows-sys";
27078-
packageId = "windows-sys 0.52.0";
27073+
packageId = "windows-sys 0.59.0";
2707927074
target = { target, features }: (target."windows" or false);
2708027075
features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ];
2708127076
}
@@ -33967,7 +33962,7 @@ rec {
3396733962
"Win32_Web" = [ "Win32" ];
3396833963
"Win32_Web_InternetExplorer" = [ "Win32_Web" ];
3396933964
};
33970-
resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Threading" "Win32_System_Time" "Win32_System_WindowsProgramming" "default" ];
33965+
resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_System" "Win32_System_IO" "Win32_System_Threading" "Win32_System_WindowsProgramming" "default" ];
3397133966
};
3397233967
"windows-sys 0.59.0" = rec {
3397333968
crateName = "windows-sys";
@@ -34226,7 +34221,7 @@ rec {
3422634221
"Win32_Web" = [ "Win32" ];
3422734222
"Win32_Web_InternetExplorer" = [ "Win32_Web" ];
3422834223
};
34229-
resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_UI" "Win32_UI_Input" "Win32_UI_Input_KeyboardAndMouse" "default" ];
34224+
resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Threading" "Win32_System_Time" "Win32_UI" "Win32_UI_Input" "Win32_UI_Input_KeyboardAndMouse" "default" ];
3423034225
};
3423134226
"windows-sys 0.60.2" = rec {
3423234227
crateName = "windows-sys";

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ crossterm = "0.29.0"
193193
[patch.crates-io]
194194
# Waiting on iocraft release with stderr rendering support
195195
# https://github.com/ccbrown/iocraft/pull/157
196-
iocraft = { git = "https://github.com/cachix/iocraft", branch = "row-level-diff" }
196+
iocraft = { git = "https://github.com/cachix/iocraft", branch = "cachix" }
197197
# https://github.com/crossterm-rs/crossterm/pull/1026
198198
crossterm = { git = "https://github.com/cachix/crossterm", branch = "0.29-cachix" }
199199

‎nix/crate-hashes.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"git+https://github.com/cachix/crossterm?rev=91e3df5ccee39f142acefb9e99de1bf43c2fea67#crossterm@0.29.0": "0wn6n3znzv1jxw9ghl6qgsancd2myafs7kxpvn3lm3wsxhpvv76l",
3-
"git+https://github.com/cachix/iocraft?rev=5e6ca047b2b6ec1918b6542c75175d65aeb79ae8#iocraft-macros@0.2.3": "1mygsp7xyyrfvfhmvzc8svrd71aglnj4bcamb8r7ibk62ndp9fyz",
4-
"git+https://github.com/cachix/iocraft?rev=5e6ca047b2b6ec1918b6542c75175d65aeb79ae8#iocraft@0.7.18": "1mygsp7xyyrfvfhmvzc8svrd71aglnj4bcamb8r7ibk62ndp9fyz",
3+
"git+https://github.com/cachix/iocraft?rev=ca24572778a0ba617f0d9c5e7bc4faa3b6024d61#iocraft-macros@0.2.3": "15dds82xy7z0dmbiqxnzb1205nqmv1yfiy5hpl4skcqrna9lb9iz",
4+
"git+https://github.com/cachix/iocraft?rev=ca24572778a0ba617f0d9c5e7bc4faa3b6024d61#iocraft@0.7.18": "15dds82xy7z0dmbiqxnzb1205nqmv1yfiy5hpl4skcqrna9lb9iz",
55
"git+https://github.com/cachix/nix-bindings-rust.git?rev=aeb4a5cca98d32b4df8808b54f73495225a09d3d#nix-bindings-bindgen-raw@0.1.0": "0z1rsh60bd7q5i1mj81q0jyq28ppbmbxlasn8brxlagg4yd0p9sr",
66
"git+https://github.com/cachix/nix-bindings-rust.git?rev=aeb4a5cca98d32b4df8808b54f73495225a09d3d#nix-bindings-expr@0.1.0": "0z1rsh60bd7q5i1mj81q0jyq28ppbmbxlasn8brxlagg4yd0p9sr",
77
"git+https://github.com/cachix/nix-bindings-rust.git?rev=aeb4a5cca98d32b4df8808b54f73495225a09d3d#nix-bindings-fetchers@0.1.0": "0z1rsh60bd7q5i1mj81q0jyq28ppbmbxlasn8brxlagg4yd0p9sr",

0 commit comments

Comments
 (0)