From a9a4cecfec4c1d64484f2375379cc4146c43488c Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 27 Aug 2025 15:10:06 +0200
Subject: [PATCH] codex: 0.23.0 -> 0.25.0

---
 pkgs/by-name/co/codex/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index fc5247c3dfed..4edb56c03e3b 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -13,18 +13,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.23.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-JS2nRh3/MNQ0mfdr2/Q10sAB38yWBLpw2zFf0dJORuM=";
+    hash = "sha256-a/cUg8yLW4vGPiTtqhyUdkV79JbOB40N4V7Asney7sk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-HbhOiTO7qFp64v+Bb62V1LxPH7qeTnWwkJKPEN4Vx6c=";
+  cargoHash = "sha256-NK1TOY5Puo881bhgF3w470k2N4LoC6/qTI93uhg7Alw=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -50,14 +50,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Wants to access unix sockets
     "--skip=allow_unix_socketpair_recvfrom"
     # Needs access to python3. However, adding python3 to nativeCheckInputs doesn't resolve the issue
+    "--skip=exec_command::session_manager::tests::session_manager_streams_and_truncates_from_now"
     "--skip=python_multiprocessing_lock_works_under_sandbox"
     # Version 0.0.0 hardcoded
     "--skip=test_conversation_create_and_send_message_ok"
     "--skip=test_send_message_session_not_found"
     "--skip=test_send_message_success"
+    "--skip=suite::auth::get_auth_status_no_auth"
+    "--skip=suite::auth::get_auth_status_with_api_key"
+    "--skip=suite::auth::get_auth_status_with_api_key_no_include_token"
+    "--skip=suite::login::login_and_cancel_chatgpt"
+    "--skip=suite::login::logout_chatgpt_removes_auth"
     # Tests fail
     "--skip=diff_render::tests::ui_snapshot_add_details"
     "--skip=diff_render::tests::ui_snapshot_update_details_with_rename"
+    "--skip=diff_render::tests::ui_snapshot_blank_context_line"
+    "--skip=diff_render::tests::ui_snapshot_single_line_replacement_counts"
+    "--skip=diff_render::tests::ui_snapshot_vertical_ellipsis_between_hunks"
+    # Needs acces to sleep. However, adding coreutils to nativeCheckInputs doesn't resolve the issue
+    "--skip=suite::exec_stream_events::test_aggregated_output_interleaves_in_order"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Wants to access /bin/zsh
@@ -72,6 +83,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=overrides_turn_context_but_keeps_cached_prefix_and_key_constant"
     "--skip=prefixes_context_and_instructions_once_and_consistently_across_requests"
     "--skip=test_apply_patch_tool"
+    "--skip=suite::prompt_caching::codex_mini_latest_tools"
+    "--skip=suite::prompt_caching::prompt_tools_are_consistent_across_requests"
   ];
 
   postInstall = lib.optionalString installShellCompletions ''