From d870438bcab82f0ec8cc619c7cdf4bf6a17ab563 Mon Sep 17 00:00:00 2001 From: Tom Bojer Date: Fri, 23 May 2025 22:49:09 +0200 Subject: [PATCH 1/2] wezterm: 0-unstable-2025-02-23 -> 0-unstable-2025-05-18 --- pkgs/by-name/we/wezterm/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index d466ff1ba7ac..5328cc98cc63 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "0-unstable-2025-02-23"; + version = "0-unstable-2025-05-18"; src = fetchFromGitHub { owner = "wez"; repo = "wezterm"; - rev = "4ff581a8aa3460d04f859fdadb50f29b3c507763"; + rev = "5663e749948df3ed3c2d8ee0bfea6c85226310d9"; fetchSubmodules = true; - hash = "sha256-KKfGB1vM8ytpNieWD6CHD5zVyUe17tFAegZFzLx7QfE="; + hash = "sha256-SQ1H16jy6GVjM8tEKZZC7AGIADLR1NyGfOT/6pFcFA0="; }; postPatch = @@ -55,7 +55,10 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoHash = "sha256-WyQYmRNlabJaCTJm7Cn9nkXfOGAcOHwhoD9vmEggrDw="; + # https://github.com/wezterm/wezterm/pull/6960/commits/cb409f1213be314bb16e59b7147da8da16d12769#diff-c6652db0a7201b6411f7af58e81a051211a22b544efededd8e514ce8bf1c4646R134 + auditable = false; + + cargoHash = "sha256-9pdkXpkIbe5HeVGvgusRaI4A6ZjDGssO5k0ULVnO6k8="; useFetchCargoVendor = true; nativeBuildInputs = [ From 5e7fa3c3d014a6986e0bee2279ee66ede05863b5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 26 May 2025 16:50:55 +0200 Subject: [PATCH 2/2] wezterm: improve link to cargo auditable issue --- pkgs/by-name/we/wezterm/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 5328cc98cc63..118a02e2c6b8 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -55,7 +55,9 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - # https://github.com/wezterm/wezterm/pull/6960/commits/cb409f1213be314bb16e59b7147da8da16d12769#diff-c6652db0a7201b6411f7af58e81a051211a22b544efededd8e514ce8bf1c4646R134 + # dep: syntax causes build failures in rare cases + # https://github.com/rust-secure-code/cargo-auditable/issues/124 + # https://github.com/wezterm/wezterm/blob/main/nix/flake.nix#L134 auditable = false; cargoHash = "sha256-9pdkXpkIbe5HeVGvgusRaI4A6ZjDGssO5k0ULVnO6k8=";