From 575ef9684220e5820d5653819c8c3ef0a93ce1dc Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 24 May 2023 12:57:51 -0400 Subject: [PATCH] ukmm: 0.8.2 -> 0.10.0 --- pkgs/tools/games/ukmm/Cargo.lock | 75 ++++++++++++++++++++----------- pkgs/tools/games/ukmm/default.nix | 26 +++++------ 2 files changed, 63 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/tools/games/ukmm/Cargo.lock index ce5211be3a8b..ffa416f84fe7 100644 --- a/pkgs/tools/games/ukmm/Cargo.lock +++ b/pkgs/tools/games/ukmm/Cargo.lock @@ -269,6 +269,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "bincode" version = "1.3.3" @@ -280,20 +286,22 @@ dependencies = [ [[package]] name = "binrw" -version = "0.9.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abb4fd60add897b9e8827e0d5fa6c2ca129ece2432d9aa13454b21ac2ecc18f" +checksum = "ab81d22cbd2d745852348b2138f3db2103afa8ce043117a374581926a523e267" dependencies = [ "array-init", "binrw_derive", + "bytemuck", ] [[package]] name = "binrw_derive" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36ff195a3a1a82d5eeb98e0069bdf3ea076042d28591396d9020fac763bf66f" +checksum = "d6b019a3efebe7f453612083202887b6f1ace59e20d010672e336eea4ed5be97" dependencies = [ + "either", "owo-colors", "proc-macro2 1.0.56", "quote 1.0.26", @@ -363,9 +371,9 @@ dependencies = [ [[package]] name = "botw-utils" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d528a00da0ca3e77131c90f89b00c4599b4ddfdd99ed3b30b00b4eea6f5d264f" +checksum = "92fcbb05a52a1b8cbb62f63f12a2d575aa89a35704f90e929ba5522a6550f634" dependencies = [ "include-flate", "once_cell", @@ -2100,6 +2108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a7d6e1419fa3129eb0802b4c99603c0d425c79fb5d76191d5a20d0ab0d664e8" dependencies = [ "libflate", + "proc-macro-hack", "proc-macro2 1.0.56", "quote 1.0.26", "syn 1.0.109", @@ -3602,12 +3611,12 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "roead" -version = "0.20.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445b9df719825043aaaf86b477169bf653e717f526947e856a327c763a5072fa" +checksum = "8d6ee119334dbf298d9c144867d9a6f5475020e3acb2116175cc16867e436941" dependencies = [ "almost", - "base64 0.13.1", + "base64 0.21.0", "binrw", "cxx", "cxx-build", @@ -3657,12 +3666,13 @@ dependencies = [ [[package]] name = "rstb" -version = "0.6.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac74c5091a7fa31438118781bec869b1b2d2d7aaf222ba993e8ac08821ea0a9" +checksum = "7926d979e44948756fef61f532234b87422a313f85551de4775f1e4c16ef92a9" dependencies = [ "crc 2.1.0", "include-flate", + "once_cell", "phf", "roead", "serde", @@ -3758,9 +3768,9 @@ dependencies = [ [[package]] name = "ryml" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fe991a678d13cadcc529060852cb5a724c38573fffe383fbe50c67587dc42" +checksum = "d623f90d8843413059c3de3ae7ae1b2e445dba85293247f3494ac97475accfc0" dependencies = [ "auto-enum", "cxx", @@ -3908,11 +3918,11 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "chrono", "hex", "indexmap", @@ -3924,9 +3934,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" dependencies = [ "darling 0.20.0", "proc-macro2 1.0.56", @@ -4585,7 +4595,7 @@ dependencies = [ [[package]] name = "uk-content" -version = "0.1.0" +version = "0.10.0" dependencies = [ "anyhow", "indexmap", @@ -4607,6 +4617,7 @@ dependencies = [ "uk-content-derive", "uk-ui", "uk-ui-derive", + "uk-util", "zstd", ] @@ -4621,7 +4632,7 @@ dependencies = [ [[package]] name = "uk-editor" -version = "0.1.0" +version = "0.10.0" dependencies = [ "anyhow", "eframe", @@ -4643,11 +4654,12 @@ dependencies = [ "uk-mod", "uk-ui", "uk-ui-derive", + "uk-util", ] [[package]] name = "uk-manager" -version = "0.1.0" +version = "0.10.0" dependencies = [ "anyhow", "anyhow_ext", @@ -4679,12 +4691,13 @@ dependencies = [ "uk-content", "uk-mod", "uk-reader", + "uk-util", "zip", ] [[package]] name = "uk-mod" -version = "0.1.0" +version = "0.10.0" dependencies = [ "anyhow", "anyhow_ext", @@ -4697,6 +4710,7 @@ dependencies = [ "indexmap", "join_str", "jwalk 0.8.1", + "lenient_semver", "log", "minicbor-ser", "mmap-rs", @@ -4717,13 +4731,14 @@ dependencies = [ "typetag", "uk-content", "uk-reader", + "uk-util", "zip", "zstd", ] [[package]] name = "uk-reader" -version = "0.1.0" +version = "0.10.0" dependencies = [ "anyhow", "anyhow_ext", @@ -4742,12 +4757,13 @@ dependencies = [ "thiserror", "typetag", "uk-content", + "uk-util", "zarchive", ] [[package]] name = "uk-ui" -version = "0.1.0" +version = "0.10.0" dependencies = [ "catppuccin-egui", "color-hex", @@ -4778,9 +4794,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "uk-util" +version = "0.10.0" +dependencies = [ + "once_cell", +] + [[package]] name = "ukmm" -version = "0.8.2" +version = "0.10.0" dependencies = [ "anyhow", "anyhow_ext", @@ -4799,6 +4822,7 @@ dependencies = [ "jwalk 0.8.1", "lenient_semver", "log", + "once_cell", "open", "parking_lot", "rayon", @@ -4815,6 +4839,7 @@ dependencies = [ "uk-mod", "uk-reader", "uk-ui", + "uk-util", "winres", "xflags", "zip", diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index 42cbed658ad0..f47b0decc733 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -12,27 +12,27 @@ rustPlatform.buildRustPackage rec { pname = "ukmm"; - version = "0.8.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = pname; rev = "v${version}"; - hash = "sha256-gZ9r+al6WsxwMEBoRPNAkBpZP5CdJkrxEEzSxH+0GdI="; + hash = "sha256-Cdbwb+YHAjGI8Sshb5dxHiCrm7QvLXRqkpEWJdvBA2Y="; }; cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w="; - "ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE="; - "egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU="; - "egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU="; - "egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s="; - "junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4="; - "msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE="; - "msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI="; - }; + lockFile = ./Cargo.lock; + outputHashes = { + "catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w="; + "ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE="; + "egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU="; + "egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU="; + "egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s="; + "junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4="; + "msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE="; + "msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI="; + }; }; RUSTC_BOOTSTRAP = true;