diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 65c7e5b406d1..5cb7c06e2cca 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -24,6 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-EK+eQfNhfVxjIsoyj43tcRjHDT9O8/n7hUz24BC42nw="; }; + # Fix build with Rust 1.86 + # FIXME: remove when merged upstream + # See: https://github.com/zellij-org/zellij/pull/4118 + cargoPatches = [ + ./rust-1.86.patch + ]; + # Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of # the vendored one postPatch = '' @@ -32,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-0+cU2C6zjVv2G8h7oK0ztMDdukVR6QRzN81/SfLZapY="; + cargoHash = "sha256-d2/tEYU2tOLtC0NHa7YBGrbmHHDV7BkUZHJ2P7GdwAw="; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ze/zellij/rust-1.86.patch b/pkgs/by-name/ze/zellij/rust-1.86.patch new file mode 100644 index 000000000000..bf938bfb3604 --- /dev/null +++ b/pkgs/by-name/ze/zellij/rust-1.86.patch @@ -0,0 +1,109 @@ +From 95ea43f1969d9f9ee50a701023b5f90cf36d3967 Mon Sep 17 00:00:00 2001 +From: tranzystorekk +Date: Thu, 3 Apr 2025 17:36:02 +0200 +Subject: [PATCH] fix(deps): fix --locked build on rust 1.86 + +--- + Cargo.lock | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 4b7bebbc67..83298ba165 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4084,7 +4084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5" + dependencies = [ + "leb128", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + ] + + [[package]] +@@ -4099,9 +4099,9 @@ dependencies = [ + + [[package]] + name = "wasmparser" +-version = "0.221.2" ++version = "0.221.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083" ++checksum = "d06bfa36ab3ac2be0dee563380147a5b81ba10dd8885d7fbbc9eb574be67d185" + dependencies = [ + "bitflags 2.5.0", + "hashbrown 0.15.2", +@@ -4129,7 +4129,7 @@ checksum = "a80742ff1b9e6d8c231ac7c7247782c6fc5bce503af760bca071811e5fc9ee56" + dependencies = [ + "anyhow", + "termcolor", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + ] + + [[package]] +@@ -4172,7 +4172,7 @@ dependencies = [ + "target-lexicon", + "trait-variant", + "wasm-encoder 0.221.2", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + "wasmtime-asm-macros", + "wasmtime-cache", + "wasmtime-component-macro", +@@ -4260,7 +4260,7 @@ dependencies = [ + "smallvec", + "target-lexicon", + "thiserror 1.0.61", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + "wasmtime-environ", + "wasmtime-versioned-export-macros", + ] +@@ -4287,7 +4287,7 @@ dependencies = [ + "smallvec", + "target-lexicon", + "wasm-encoder 0.221.2", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + "wasmprinter", + "wasmtime-component-util", + ] +@@ -4398,7 +4398,7 @@ dependencies = [ + "gimli 0.31.1", + "object 0.36.7", + "target-lexicon", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + "wasmtime-cranelift", + "wasmtime-environ", + "winch-codegen", +@@ -4635,7 +4635,7 @@ dependencies = [ + "smallvec", + "target-lexicon", + "thiserror 1.0.61", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + "wasmtime-cranelift", + "wasmtime-environ", + ] +@@ -4893,9 +4893,9 @@ dependencies = [ + + [[package]] + name = "wit-parser" +-version = "0.221.2" ++version = "0.221.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbe1538eea6ea5ddbe5defd0dc82539ad7ba751e1631e9185d24a931f0a5adc8" ++checksum = "896112579ed56b4a538b07a3d16e562d101ff6265c46b515ce0c701eef16b2ac" + dependencies = [ + "anyhow", + "id-arena", +@@ -4906,7 +4906,7 @@ dependencies = [ + "serde_derive", + "serde_json", + "unicode-xid", +- "wasmparser 0.221.2", ++ "wasmparser 0.221.3", + ] + + [[package]]