Merge pull request #233857 from kira-bruneau/ukmm

ukmm: 0.8.2 -> 0.10.0

authored by Felix Bühler and committed by GitHub 82c2abdc e07d7e38

+66 -38
+50 -25
pkgs/tools/games/ukmm/Cargo.lock
··· 270 270 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" 271 271 272 272 [[package]] 273 + name = "base64" 274 + version = "0.21.0" 275 + source = "registry+https://github.com/rust-lang/crates.io-index" 276 + checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" 277 + 278 + [[package]] 273 279 name = "bincode" 274 280 version = "1.3.3" 275 281 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 280 286 281 287 [[package]] 282 288 name = "binrw" 283 - version = "0.9.2" 289 + version = "0.11.2" 284 290 source = "registry+https://github.com/rust-lang/crates.io-index" 285 - checksum = "4abb4fd60add897b9e8827e0d5fa6c2ca129ece2432d9aa13454b21ac2ecc18f" 291 + checksum = "ab81d22cbd2d745852348b2138f3db2103afa8ce043117a374581926a523e267" 286 292 dependencies = [ 287 293 "array-init", 288 294 "binrw_derive", 295 + "bytemuck", 289 296 ] 290 297 291 298 [[package]] 292 299 name = "binrw_derive" 293 - version = "0.9.0" 300 + version = "0.11.2" 294 301 source = "registry+https://github.com/rust-lang/crates.io-index" 295 - checksum = "a36ff195a3a1a82d5eeb98e0069bdf3ea076042d28591396d9020fac763bf66f" 302 + checksum = "d6b019a3efebe7f453612083202887b6f1ace59e20d010672e336eea4ed5be97" 296 303 dependencies = [ 304 + "either", 297 305 "owo-colors", 298 306 "proc-macro2 1.0.56", 299 307 "quote 1.0.26", ··· 363 371 364 372 [[package]] 365 373 name = "botw-utils" 366 - version = "0.4.1" 374 + version = "0.5.0" 367 375 source = "registry+https://github.com/rust-lang/crates.io-index" 368 - checksum = "d528a00da0ca3e77131c90f89b00c4599b4ddfdd99ed3b30b00b4eea6f5d264f" 376 + checksum = "92fcbb05a52a1b8cbb62f63f12a2d575aa89a35704f90e929ba5522a6550f634" 369 377 dependencies = [ 370 378 "include-flate", 371 379 "once_cell", ··· 2100 2108 checksum = "3a7d6e1419fa3129eb0802b4c99603c0d425c79fb5d76191d5a20d0ab0d664e8" 2101 2109 dependencies = [ 2102 2110 "libflate", 2111 + "proc-macro-hack", 2103 2112 "proc-macro2 1.0.56", 2104 2113 "quote 1.0.26", 2105 2114 "syn 1.0.109", ··· 3602 3611 3603 3612 [[package]] 3604 3613 name = "roead" 3605 - version = "0.20.3" 3614 + version = "0.23.0" 3606 3615 source = "registry+https://github.com/rust-lang/crates.io-index" 3607 - checksum = "445b9df719825043aaaf86b477169bf653e717f526947e856a327c763a5072fa" 3616 + checksum = "8d6ee119334dbf298d9c144867d9a6f5475020e3acb2116175cc16867e436941" 3608 3617 dependencies = [ 3609 3618 "almost", 3610 - "base64 0.13.1", 3619 + "base64 0.21.0", 3611 3620 "binrw", 3612 3621 "cxx", 3613 3622 "cxx-build", ··· 3657 3666 3658 3667 [[package]] 3659 3668 name = "rstb" 3660 - version = "0.6.0" 3669 + version = "0.8.1" 3661 3670 source = "registry+https://github.com/rust-lang/crates.io-index" 3662 - checksum = "3ac74c5091a7fa31438118781bec869b1b2d2d7aaf222ba993e8ac08821ea0a9" 3671 + checksum = "7926d979e44948756fef61f532234b87422a313f85551de4775f1e4c16ef92a9" 3663 3672 dependencies = [ 3664 3673 "crc 2.1.0", 3665 3674 "include-flate", 3675 + "once_cell", 3666 3676 "phf", 3667 3677 "roead", 3668 3678 "serde", ··· 3758 3768 3759 3769 [[package]] 3760 3770 name = "ryml" 3761 - version = "0.1.6" 3771 + version = "0.2.0" 3762 3772 source = "registry+https://github.com/rust-lang/crates.io-index" 3763 - checksum = "905fe991a678d13cadcc529060852cb5a724c38573fffe383fbe50c67587dc42" 3773 + checksum = "d623f90d8843413059c3de3ae7ae1b2e445dba85293247f3494ac97475accfc0" 3764 3774 dependencies = [ 3765 3775 "auto-enum", 3766 3776 "cxx", ··· 3908 3918 3909 3919 [[package]] 3910 3920 name = "serde_with" 3911 - version = "2.3.3" 3921 + version = "3.0.0" 3912 3922 source = "registry+https://github.com/rust-lang/crates.io-index" 3913 - checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" 3923 + checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" 3914 3924 dependencies = [ 3915 - "base64 0.13.1", 3925 + "base64 0.21.0", 3916 3926 "chrono", 3917 3927 "hex", 3918 3928 "indexmap", ··· 3924 3934 3925 3935 [[package]] 3926 3936 name = "serde_with_macros" 3927 - version = "2.3.3" 3937 + version = "3.0.0" 3928 3938 source = "registry+https://github.com/rust-lang/crates.io-index" 3929 - checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" 3939 + checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" 3930 3940 dependencies = [ 3931 3941 "darling 0.20.0", 3932 3942 "proc-macro2 1.0.56", ··· 4585 4595 4586 4596 [[package]] 4587 4597 name = "uk-content" 4588 - version = "0.1.0" 4598 + version = "0.10.0" 4589 4599 dependencies = [ 4590 4600 "anyhow", 4591 4601 "indexmap", ··· 4607 4617 "uk-content-derive", 4608 4618 "uk-ui", 4609 4619 "uk-ui-derive", 4620 + "uk-util", 4610 4621 "zstd", 4611 4622 ] 4612 4623 ··· 4621 4632 4622 4633 [[package]] 4623 4634 name = "uk-editor" 4624 - version = "0.1.0" 4635 + version = "0.10.0" 4625 4636 dependencies = [ 4626 4637 "anyhow", 4627 4638 "eframe", ··· 4643 4654 "uk-mod", 4644 4655 "uk-ui", 4645 4656 "uk-ui-derive", 4657 + "uk-util", 4646 4658 ] 4647 4659 4648 4660 [[package]] 4649 4661 name = "uk-manager" 4650 - version = "0.1.0" 4662 + version = "0.10.0" 4651 4663 dependencies = [ 4652 4664 "anyhow", 4653 4665 "anyhow_ext", ··· 4679 4691 "uk-content", 4680 4692 "uk-mod", 4681 4693 "uk-reader", 4694 + "uk-util", 4682 4695 "zip", 4683 4696 ] 4684 4697 4685 4698 [[package]] 4686 4699 name = "uk-mod" 4687 - version = "0.1.0" 4700 + version = "0.10.0" 4688 4701 dependencies = [ 4689 4702 "anyhow", 4690 4703 "anyhow_ext", ··· 4697 4710 "indexmap", 4698 4711 "join_str", 4699 4712 "jwalk 0.8.1", 4713 + "lenient_semver", 4700 4714 "log", 4701 4715 "minicbor-ser", 4702 4716 "mmap-rs", ··· 4717 4731 "typetag", 4718 4732 "uk-content", 4719 4733 "uk-reader", 4734 + "uk-util", 4720 4735 "zip", 4721 4736 "zstd", 4722 4737 ] 4723 4738 4724 4739 [[package]] 4725 4740 name = "uk-reader" 4726 - version = "0.1.0" 4741 + version = "0.10.0" 4727 4742 dependencies = [ 4728 4743 "anyhow", 4729 4744 "anyhow_ext", ··· 4742 4757 "thiserror", 4743 4758 "typetag", 4744 4759 "uk-content", 4760 + "uk-util", 4745 4761 "zarchive", 4746 4762 ] 4747 4763 4748 4764 [[package]] 4749 4765 name = "uk-ui" 4750 - version = "0.1.0" 4766 + version = "0.10.0" 4751 4767 dependencies = [ 4752 4768 "catppuccin-egui", 4753 4769 "color-hex", ··· 4779 4795 ] 4780 4796 4781 4797 [[package]] 4798 + name = "uk-util" 4799 + version = "0.10.0" 4800 + dependencies = [ 4801 + "once_cell", 4802 + ] 4803 + 4804 + [[package]] 4782 4805 name = "ukmm" 4783 - version = "0.8.2" 4806 + version = "0.10.0" 4784 4807 dependencies = [ 4785 4808 "anyhow", 4786 4809 "anyhow_ext", ··· 4799 4822 "jwalk 0.8.1", 4800 4823 "lenient_semver", 4801 4824 "log", 4825 + "once_cell", 4802 4826 "open", 4803 4827 "parking_lot", 4804 4828 "rayon", ··· 4815 4839 "uk-mod", 4816 4840 "uk-reader", 4817 4841 "uk-ui", 4842 + "uk-util", 4818 4843 "winres", 4819 4844 "xflags", 4820 4845 "zip",
+16 -13
pkgs/tools/games/ukmm/default.nix
··· 7 7 , atk 8 8 , glib 9 9 , gtk3-x11 10 + , nix-update-script 10 11 }: 11 12 12 13 rustPlatform.buildRustPackage rec { 13 14 pname = "ukmm"; 14 - version = "0.8.2"; 15 + version = "0.10.0"; 15 16 16 17 src = fetchFromGitHub { 17 18 owner = "NiceneNerd"; 18 19 repo = pname; 19 20 rev = "v${version}"; 20 - hash = "sha256-gZ9r+al6WsxwMEBoRPNAkBpZP5CdJkrxEEzSxH+0GdI="; 21 + hash = "sha256-Cdbwb+YHAjGI8Sshb5dxHiCrm7QvLXRqkpEWJdvBA2Y="; 21 22 }; 22 23 23 24 cargoLock = { 24 - lockFile = ./Cargo.lock; 25 - outputHashes = { 26 - "catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w="; 27 - "ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE="; 28 - "egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU="; 29 - "egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU="; 30 - "egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s="; 31 - "junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4="; 32 - "msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE="; 33 - "msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI="; 34 - }; 25 + lockFile = ./Cargo.lock; 26 + outputHashes = { 27 + "catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w="; 28 + "ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE="; 29 + "egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU="; 30 + "egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU="; 31 + "egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s="; 32 + "junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4="; 33 + "msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE="; 34 + "msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI="; 35 + }; 35 36 }; 36 37 37 38 RUSTC_BOOTSTRAP = true; ··· 65 66 # Requires Clear Camera mod 66 67 "--skip=bnp::test_convert" 67 68 ]; 69 + 70 + passthru.updateScript = nix-update-script { }; 68 71 69 72 meta = with lib; { 70 73 description = "A new mod manager for The Legend of Zelda: Breath of the Wild";