From 7a74a3422ba1a4b028ff1f0f1f214aae041c8168 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 15 Apr 2025 09:21:20 +0200
Subject: [PATCH] zellij: 0.42.1 -> 0.42.2

Diff: https://github.com/zellij-org/zellij/compare/v0.42.1...v0.42.2

Changelog: https://github.com/zellij-org/zellij/releases/tag/v0.42.2
---
 pkgs/by-name/ze/zellij/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 5cb7c06e2cca..0c4b7e976449 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -15,22 +15,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zellij";
-  version = "0.42.1";
+  version = "0.42.2";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EK+eQfNhfVxjIsoyj43tcRjHDT9O8/n7hUz24BC42nw=";
+    hash = "sha256-O7BZlPSBWy+q349NYCUsw4Rb5X3xyl5Ar+a/uQPQhZY=";
   };
 
-  # 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 = ''
@@ -39,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-d2/tEYU2tOLtC0NHa7YBGrbmHHDV7BkUZHJ2P7GdwAw=";
+  cargoHash = "sha256-Vo3bshaHjy2F2WFGgaIDEFFAh0e5VPp2G4fETgIH484=";
 
   env.OPENSSL_NO_VENDOR = 1;