diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index c31ae3958..c5cd0814e 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -283,6 +283,7 @@ zenity = {} zoxide = {} zsh = {} zlib = {} +zola = {} zstd = {} #benchmarks = {} diff --git a/recipes/wip/web/zola/recipe.toml b/recipes/wip/web/zola/recipe.toml index cf1e83b69..97ff45fe4 100644 --- a/recipes/wip/web/zola/recipe.toml +++ b/recipes/wip/web/zola/recipe.toml @@ -2,7 +2,7 @@ [source] git = "https://github.com/getzola/zola" shallow_clone = true -rev = "33f03bb11158464e3ff877cdc5f1c55bbe7337ac" +rev = "ffb8327" patches = [ "redox.patch" ] diff --git a/recipes/wip/web/zola/redox.patch b/recipes/wip/web/zola/redox.patch index ad4980a18..14b6d722e 100644 --- a/recipes/wip/web/zola/redox.patch +++ b/recipes/wip/web/zola/redox.patch @@ -1,91 +1,150 @@ diff --git a/Cargo.lock b/Cargo.lock -index 25c8de7..23e44f4 100644 +index 25c8de7..b1f1f4e 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -411,15 +411,6 @@ dependencies = [ - "generic-array", +@@ -123,7 +123,7 @@ version = "1.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" + dependencies = [ +- "windows-sys 0.61.2", ++ "windows-sys 0.60.2", ] --[[package]] --name = "block2" --version = "0.6.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" --dependencies = [ -- "objc2", --] -- [[package]] - name = "bstr" - version = "1.12.1" -@@ -986,13 +977,12 @@ dependencies = [ +@@ -134,7 +134,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" + dependencies = [ + "anstyle", + "once_cell_polyfill", +- "windows-sys 0.61.2", ++ "windows-sys 0.60.2", + ] + + [[package]] +@@ -710,7 +710,7 @@ version = "3.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" + dependencies = [ +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -986,9 +986,9 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.5.1" -+version = "3.4.7" ++version = "3.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790" -+checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73" ++checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162" dependencies = [ -- "dispatch2", + "dispatch2", "nix", -- "windows-sys 0.61.2", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -1048,18 +1038,6 @@ dependencies = [ - "crypto-common", - ] - --[[package]] --name = "dispatch2" --version = "0.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" --dependencies = [ -- "bitflags 2.10.0", -- "block2", -- "libc", -- "objc2", --] -- - [[package]] - name = "displaydoc" - version = "0.2.5" -@@ -3046,21 +3024,6 @@ dependencies = [ +@@ -1287,7 +1287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" + dependencies = [ "libc", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -2298,9 +2298,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.180" ++version = "0.2.186" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" ++checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + + [[package]] + name = "libfuzzer-sys" +@@ -2550,9 +2550,9 @@ dependencies = [ + + [[package]] + name = "linux-raw-sys" +-version = "0.11.0" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" ++checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" + + [[package]] + name = "litemap" +@@ -2828,9 +2828,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + + [[package]] + name = "nix" +-version = "0.30.1" ++version = "0.31.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" ++checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" + dependencies = [ + "bitflags 2.10.0", + "cfg-if", +@@ -4384,15 +4384,15 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "1.1.3" ++version = "1.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" ++checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" + dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -4517,7 +4517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" + dependencies = [ + "libc", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -4910,7 +4910,7 @@ dependencies = [ + "getrandom 0.3.4", + "once_cell", + "rustix", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -5702,7 +5702,7 @@ version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" + dependencies = [ +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", ] --[[package]] --name = "objc2" --version = "0.6.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" --dependencies = [ -- "objc2-encode", --] -- --[[package]] --name = "objc2-encode" --version = "4.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" -- [[package]] - name = "once_cell" - version = "1.21.3" diff --git a/Cargo.toml b/Cargo.toml -index a08be28..a9df3da 100644 +index a08be28..d4242f8 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -29,7 +29,7 @@ clap_complete = "4" - axum = { version = "0.8", default-features = false, features = ["http1", "tokio", "ws"] } - tokio = { version = "1.0.1", default-features = false, features = ["rt", "fs", "time", "net", "sync"] } - notify-debouncer-full = "0.6" --ctrlc = "3" -+ctrlc = "=3.4.7" - open = "5" - # For mimetype detection in serve mode - mime_guess = "2.0" +@@ -134,11 +134,6 @@ site = { path = "components/site" } + templates = { path = "components/templates" } + utils = { path = "components/utils" } + +-[profile.release] +-lto = true +-codegen-units = 1 +-strip = true +- + [profile.dev] + # Disabling debug info speeds up builds a bunch, + # and we don't rely on it for debugging that much.