From 35c99edbf3c05122bca77b055a52c29377f39b6f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 16 Nov 2025 12:49:56 +0800 Subject: [PATCH 1/2] terracotta: 0.3.13 -> 0.3.14-rc.2 --- ...ead-timestamp-from-SOURCE_DATE_EPOCH.patch | 4 +- ...0002-nix-use-easytier-from-nix-input.patch | 114 ++++++------ pkgs/by-name/te/terracotta/Cargo.lock | 174 ++++++++---------- pkgs/by-name/te/terracotta/package.nix | 4 +- 4 files changed, 136 insertions(+), 160 deletions(-) diff --git a/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch b/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch index 853db4d5176b..c167dd39df5a 100644 --- a/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch +++ b/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch @@ -1,6 +1,6 @@ -From d5680fd01964755c39c0fd5c128c972d9bd9a044 Mon Sep 17 00:00:00 2001 +From f89d1d20a773cff73dd5856af4c84bccaea549ac Mon Sep 17 00:00:00 2001 From: Moraxyc -Date: Tue, 28 Oct 2025 16:57:58 +0800 +Date: Sat, 8 Nov 2025 15:18:44 +0800 Subject: [PATCH 1/2] nix: read timestamp from SOURCE_DATE_EPOCH --- diff --git a/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch b/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch index 6b95c3f6d2cd..29cb9c7c6d68 100644 --- a/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch +++ b/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch @@ -1,11 +1,11 @@ -From 8c8ef3bcdbebb11999a6a229de2d537c9a0110a9 Mon Sep 17 00:00:00 2001 +From cbf623903a0efdbd9b105f24aae6ac9ce0a4d21e Mon Sep 17 00:00:00 2001 From: Moraxyc -Date: Tue, 28 Oct 2025 17:01:29 +0800 +Date: Sat, 8 Nov 2025 15:22:08 +0800 Subject: [PATCH 2/2] nix: use easytier from nix input --- - build.rs | 3 ++- - src/easytier.rs | 31 +++---------------------------- + build.rs | 3 ++- + src/easytier/executable_impl.rs | 31 +++---------------------------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/build.rs b/build.rs @@ -22,59 +22,59 @@ index dc6e117..df454d9 100644 sevenz_rust2::compress_to_path( "web", -diff --git a/src/easytier.rs b/src/easytier.rs -index c657a08..38e6abd 100644 ---- a/src/easytier.rs -+++ b/src/easytier.rs -@@ -14,12 +14,6 @@ use std::{ - time::Duration, - }; - --static EASYTIER_ARCHIVE: (&str, &str, &[u8]) = ( -- include_str!(env!("TERRACOTTA_ET_ENTRY_CONF")), -- include_str!(env!("TERRACOTTA_ET_CLI_CONF")), -- include_bytes!(env!("TERRACOTTA_ET_ARCHIVE")), --); -- - lazy_static::lazy_static! { - pub static ref FACTORY: EasytierFactory = create(); - } -@@ -36,32 +30,13 @@ pub struct Easytier { - } - - fn create() -> EasytierFactory { -- let _ = fs::create_dir_all(&*EASYTIER_DIR); -- - logging!( - "Easytier", -- "Releasing easytier to {}", -- &*EASYTIER_DIR.to_string_lossy() -+ "Using path @TERRACOTTA_ET_PATH@ (Nix)." - ); - -- sevenz_rust2::decompress(Cursor::new(EASYTIER_ARCHIVE.2.to_vec()), &*EASYTIER_DIR) -- .map_err(|e| Error::other(e.to_string())) -- .unwrap(); -- -- let exe: PathBuf = Path::join(&EASYTIER_DIR, EASYTIER_ARCHIVE.0); -- let cli: PathBuf = Path::join(&EASYTIER_DIR, EASYTIER_ARCHIVE.1); -- #[cfg(target_family = "unix")] -- { -- use std::os::unix::fs::PermissionsExt; -- -- let mut permissions = fs::metadata(exe.clone()).unwrap().permissions(); -- permissions.set_mode(permissions.mode() | 0o100); -- fs::set_permissions(exe.clone(), permissions).unwrap(); -- -- let mut permissions = fs::metadata(cli.clone()).unwrap().permissions(); -- permissions.set_mode(permissions.mode() | 0o100); -- fs::set_permissions(cli.clone(), permissions).unwrap(); -- } -+ let exe: PathBuf = PathBuf::from("@TERRACOTTA_ET_EXE@"); -+ let cli: PathBuf = PathBuf::from("@TERRACOTTA_ET_CLI@"); - EasytierFactory { exe, cli } - } - +diff --git a/src/easytier/executable_impl.rs b/src/easytier/executable_impl.rs +index 4444060..c534360 100644 +--- a/src/easytier/executable_impl.rs ++++ b/src/easytier/executable_impl.rs +@@ -16,12 +16,6 @@ use std::{ + time::Duration, + }; + +-static EASYTIER_ARCHIVE: (&str, &str, &[u8]) = ( +- include_str!(env!("TERRACOTTA_ET_ENTRY_CONF")), +- include_str!(env!("TERRACOTTA_ET_CLI_CONF")), +- include_bytes!(env!("TERRACOTTA_ET_ARCHIVE")), +-); +- + lazy_static::lazy_static! { + pub static ref FACTORY: EasytierFactory = create(); + } +@@ -38,32 +32,13 @@ pub struct Easytier { + } + + fn create() -> EasytierFactory { +- let _ = fs::create_dir_all(&*EASYTIER_DIR); +- + logging!( + "Easytier", +- "Releasing easytier to {}", +- &*EASYTIER_DIR.to_string_lossy() ++ "Using path @TERRACOTTA_ET_PATH@ (Nix)." + ); + +- sevenz_rust2::decompress(Cursor::new(EASYTIER_ARCHIVE.2.to_vec()), &*EASYTIER_DIR) +- .map_err(|e| Error::other(e.to_string())) +- .unwrap(); +- +- let exe: PathBuf = Path::join(&EASYTIER_DIR, EASYTIER_ARCHIVE.0); +- let cli: PathBuf = Path::join(&EASYTIER_DIR, EASYTIER_ARCHIVE.1); +- #[cfg(target_family = "unix")] +- { +- use std::os::unix::fs::PermissionsExt; +- +- let mut permissions = fs::metadata(exe.clone()).unwrap().permissions(); +- permissions.set_mode(permissions.mode() | 0o100); +- fs::set_permissions(exe.clone(), permissions).unwrap(); +- +- let mut permissions = fs::metadata(cli.clone()).unwrap().permissions(); +- permissions.set_mode(permissions.mode() | 0o100); +- fs::set_permissions(cli.clone(), permissions).unwrap(); +- } ++ let exe: PathBuf = PathBuf::from("@TERRACOTTA_ET_EXE@"); ++ let cli: PathBuf = PathBuf::from("@TERRACOTTA_ET_CLI@"); + EasytierFactory { exe, cli } + } + -- 2.51.0 diff --git a/pkgs/by-name/te/terracotta/Cargo.lock b/pkgs/by-name/te/terracotta/Cargo.lock index b318ad3409ef..3fd3cb651b49 100644 --- a/pkgs/by-name/te/terracotta/Cargo.lock +++ b/pkgs/by-name/te/terracotta/Cargo.lock @@ -54,9 +54,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "async-compression" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" +checksum = "93c1f86859c1af3d514fa19e8323147ff10ea98684e6c7b307912509f50e67b2" dependencies = [ "compression-codecs", "compression-core", @@ -84,7 +84,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -95,7 +95,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -181,9 +181,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "bzip2" @@ -196,9 +196,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.44" +version = "1.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" dependencies = [ "find-msvc-tools", "jobserver", @@ -226,7 +226,7 @@ checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ "iana-time-zone", "num-traits", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -241,9 +241,9 @@ dependencies = [ [[package]] name = "compression-codecs" -version = "0.4.31" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" +checksum = "680dc087785c5230f8e8843e2e57ac7c1c90488b6a91b88caa265410568f441b" dependencies = [ "compression-core", "flate2", @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" +checksum = "3a9b614a5787ef0c8802a55766480563cb3a93b435898c422ed2a359cf811582" [[package]] name = "constant_time_eq" @@ -310,9 +310,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -341,7 +341,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -374,7 +374,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -429,7 +429,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -491,9 +491,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "flate2" @@ -607,9 +607,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.9" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -787,9 +787,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -814,7 +814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ "http 1.3.1", - "hyper 1.7.0", + "hyper 1.8.1", "hyper-util", "rustls", "rustls-pki-types", @@ -826,9 +826,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ "base64", "bytes", @@ -837,7 +837,7 @@ dependencies = [ "futures-util", "http 1.3.1", "http-body 1.0.1", - "hyper 1.7.0", + "hyper 1.8.1", "ipnet", "libc", "percent-encoding", @@ -1011,9 +1011,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" dependencies = [ "memchr", "serde", @@ -1270,9 +1270,9 @@ dependencies = [ [[package]] name = "native-dialog" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b63bf0e60ee0eca886b5df70269240b6197b6ee46ec37da9a7d28d8e8e24" +checksum = "454a816a8fed70bb5ba4ae90901073173dd5142f5df5ee503acde1ebcfaa4c4b" dependencies = [ "ascii", "block2", @@ -1611,7 +1611,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1650,7 +1650,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1694,9 +1694,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppmd-rust" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c834641d8ad1b348c9ee86dec3b9840d805acd5f24daa5f90c788951a52ff59b" +checksum = "d558c559f0450f16f2a27a1f017ef38468c1090c9ce63c8e51366232d53717b4" [[package]] name = "ppv-lite86" @@ -1724,7 +1724,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "version_check", "yansi", ] @@ -1786,9 +1786,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] @@ -1901,7 +1901,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -1938,7 +1938,7 @@ dependencies = [ "http 1.3.1", "http-body 1.0.1", "http-body-util", - "hyper 1.7.0", + "hyper 1.8.1", "hyper-rustls", "hyper-util", "js-sys", @@ -2030,7 +2030,7 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn 2.0.108", + "syn 2.0.110", "unicode-xid", "version_check", ] @@ -2083,9 +2083,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.34" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "once_cell", "ring", @@ -2167,7 +2167,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2348,9 +2348,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.108" +version = "2.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" +checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" dependencies = [ "proc-macro2", "quote", @@ -2374,7 +2374,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2461,7 +2461,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2560,7 +2560,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2586,9 +2586,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -2741,7 +2741,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -2941,7 +2941,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "wasm-bindgen-shared", ] @@ -3044,9 +3044,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -3057,7 +3057,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3068,15 +3068,9 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -3085,22 +3079,13 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -3109,16 +3094,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -3127,7 +3103,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3163,7 +3139,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3203,7 +3179,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -3363,9 +3339,9 @@ dependencies = [ [[package]] name = "winresource" -version = "0.1.25" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f882b1d5b5ab0c26bdd08afa85da4b829a982772088d1da911698e08976daf9b" +checksum = "f1ef04dd590e94ff7431a8eda99d5ca659e688d60e930bd0a330062acea4608f" dependencies = [ "toml 0.9.8", "version_check", @@ -3417,7 +3393,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "synstructure", ] @@ -3438,7 +3414,7 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3458,7 +3434,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", "synstructure", ] @@ -3479,7 +3455,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] @@ -3512,7 +3488,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.108", + "syn 2.0.110", ] [[package]] diff --git a/pkgs/by-name/te/terracotta/package.nix b/pkgs/by-name/te/terracotta/package.nix index 69400580d8f3..c431ef901625 100644 --- a/pkgs/by-name/te/terracotta/package.nix +++ b/pkgs/by-name/te/terracotta/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "terracotta"; - version = "0.3.13"; + version = "0.3.14-rc.2"; src = fetchFromGitHub { owner = "burningtnt"; repo = "Terracotta"; tag = "v${finalAttrs.version}"; - hash = "sha256-2Ghn/f0EaWOLhabxY7WBEesB/28fojreXs1ve1PvpdM="; + hash = "sha256-TqKxkCBWRQfKrwbhh9nMFcAEjf1j36Dy6PleYwtGT/A="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From c7f8b2df24652d2ab23027d5e89414473de47a78 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sun, 23 Nov 2025 09:19:38 +0900 Subject: [PATCH 2/2] terracotta: 0.3.14-rc.2 -> 0.3.14 --- pkgs/by-name/te/terracotta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/terracotta/package.nix b/pkgs/by-name/te/terracotta/package.nix index c431ef901625..ff574808e251 100644 --- a/pkgs/by-name/te/terracotta/package.nix +++ b/pkgs/by-name/te/terracotta/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "terracotta"; - version = "0.3.14-rc.2"; + version = "0.3.14"; src = fetchFromGitHub { owner = "burningtnt"; repo = "Terracotta"; tag = "v${finalAttrs.version}"; - hash = "sha256-TqKxkCBWRQfKrwbhh9nMFcAEjf1j36Dy6PleYwtGT/A="; + hash = "sha256-zp3Ax0A7Vc6LnZiWu2pWzQTWvYH9NRmqSfmxK756qA8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true;