diff --git a/devel/codex/Makefile b/devel/codex/Makefile index f06de75a407..2d2aadbea2b 100644 --- a/devel/codex/Makefile +++ b/devel/codex/Makefile @@ -6,7 +6,7 @@ DPB_PROPERTIES = parallel USE_WXNEEDED = Yes -V = 0.137.0 +V = 0.138.0 GH_ACCOUNT = openai GH_PROJECT = codex GH_TAGNAME = rust-v${V} @@ -79,8 +79,9 @@ MODCARGO_ENV += V8_FROM_SOURCE=1 \ # Makes the build look more alive while compiling v8 MODCARGO_BUILD_ARGS += -vv -# install the CLI crate ('codex') +# build only the CLI crate ('codex') MODCARGO_INSTALL_TARGET_PATHS = cli +MODCARGO_BUILD_ARGS += -p codex-cli --bin codex MAKE_ENV = ${MODCARGO_ENV} diff --git a/devel/codex/distinfo b/devel/codex/distinfo index 9b6d01d0193..12ccffadbd9 100644 --- a/devel/codex/distinfo +++ b/devel/codex/distinfo @@ -1179,7 +1179,7 @@ SHA256 (cargo/zune-jpeg-0.5.12.tar.gz) = QQ6ezvY0xwnjgxws/bjZwyFk+uHGdJbVto//co7 SHA256 (cargo/zvariant-4.2.0.tar.gz) = IIQpCrmhxHHDj8UklFg3c0+/EkSH4QXa7Cu1f9SMgf4= SHA256 (cargo/zvariant_derive-4.2.0.tar.gz) = c+K6VGvaaDqQZSusSiebwUatrROG8lN5z3MgDSACxEk= SHA256 (cargo/zvariant_utils-2.1.0.tar.gz) = xRvP98w9u1BVOWvPd0dIw9q0JrS4ZZBGljUjzuSAg0A= -SHA256 (codex-rust-v0.137.0.tar.gz) = 8io+VbMwmOzHN+0GF0HTLe65zwoXsEuSUXlsqlxeQCM= +SHA256 (codex-rust-v0.138.0.tar.gz) = 843p7ZVpdrcW77L0XP8Rh3OkIRpz0vWMmSQ3mZswpb8= SHA256 (dzbarsky-rules_rust-b56cbaa8465e74127f1ea216f813cd377295ad81.tar.gz) = 3b30DbjfaF32fDJg3+Wc9/+ksZOpMk4Qs1m76JgdueA= SHA256 (helix-editor-nucleo-4253de9faabb4e5c6d81d946a5e35a90f87347ee.tar.gz) = 0WdqwzqCxZA//t5oznPJ2SRmaqihArtkmo+5JqemHOE= SHA256 (nornagon-crossterm-87db8bfa6dc99427fd3b071681b07fc31c6ce995.tar.gz) = tJrDQua12cAV9ThGkMKmHW8xwMPDSq8cwivklWEiKUw= @@ -2367,7 +2367,7 @@ SIZE (cargo/zune-jpeg-0.5.12.tar.gz) = 86116 SIZE (cargo/zvariant-4.2.0.tar.gz) = 82180 SIZE (cargo/zvariant_derive-4.2.0.tar.gz) = 11057 SIZE (cargo/zvariant_utils-2.1.0.tar.gz) = 7043 -SIZE (codex-rust-v0.137.0.tar.gz) = 8418800 +SIZE (codex-rust-v0.138.0.tar.gz) = 8465543 SIZE (dzbarsky-rules_rust-b56cbaa8465e74127f1ea216f813cd377295ad81.tar.gz) = 3951333 SIZE (helix-editor-nucleo-4253de9faabb4e5c6d81d946a5e35a90f87347ee.tar.gz) = 86782 SIZE (nornagon-crossterm-87db8bfa6dc99427fd3b071681b07fc31c6ce995.tar.gz) = 129254 diff --git a/devel/codex/patches/patch-codex-rs_Cargo_toml b/devel/codex/patches/patch-codex-rs_Cargo_toml index 6724749f988..d672f5f8ee2 100644 --- a/devel/codex/patches/patch-codex-rs_Cargo_toml +++ b/devel/codex/patches/patch-codex-rs_Cargo_toml @@ -1,7 +1,7 @@ Index: codex-rs/Cargo.toml --- codex-rs/Cargo.toml.orig +++ codex-rs/Cargo.toml -@@ -321,7 +321,7 @@ maplit = "1.0.2" +@@ -322,7 +322,7 @@ memchr = "2.7.6" mime_guess = "2.0.5" multimap = "0.10.0" notify = "8.2.0" @@ -10,7 +10,7 @@ Index: codex-rs/Cargo.toml once_cell = "1.20.2" openssl-sys = "*" opentelemetry = "0.31.0" -@@ -349,7 +349,7 @@ regex = "1.12.3" +@@ -350,7 +350,7 @@ regex = "1.12.3" regex-lite = "0.1.8" reqwest = { version = "0.12", features = ["cookies"] } rmcp = { version = "1.7.0", default-features = false } diff --git a/devel/codex/patches/patch-codex-rs_arg0_src_lib_rs b/devel/codex/patches/patch-codex-rs_arg0_src_lib_rs index dabe2330c43..4ed4dda14bc 100644 --- a/devel/codex/patches/patch-codex-rs_arg0_src_lib_rs +++ b/devel/codex/patches/patch-codex-rs_arg0_src_lib_rs @@ -1,7 +1,7 @@ Index: codex-rs/arg0/src/lib.rs --- codex-rs/arg0/src/lib.rs.orig +++ codex-rs/arg0/src/lib.rs -@@ -194,6 +194,9 @@ where +@@ -219,6 +219,9 @@ where let runtime = build_runtime()?; runtime.block_on(run_main_with_arg0_guard( path_entry_guard, @@ -11,7 +11,7 @@ Index: codex-rs/arg0/src/lib.rs current_exe, main_fn, )) -@@ -348,6 +351,9 @@ pub fn prepend_path_entry_for_codex_aliases() -> std:: +@@ -374,6 +377,9 @@ fn prepare_path_entry_for_codex_aliases( #[cfg(unix)] EXECVE_WRAPPER_ARG0, ] { @@ -21,8 +21,8 @@ Index: codex-rs/arg0/src/lib.rs let exe = std::env::current_exe()?; #[cfg(unix)] -@@ -394,7 +400,16 @@ pub fn prepend_path_entry_for_codex_aliases() -> std:: - } +@@ -400,7 +406,16 @@ fn prepare_path_entry_for_codex_aliases( + let updated_path_env_var = path_env_with_entry(path, existing_path); let paths = Arg0DispatchPaths { - codex_self_exe: std::env::current_exe().ok(), diff --git a/devel/codex/patches/patch-codex-rs_core_src_config_mod_rs b/devel/codex/patches/patch-codex-rs_core_src_config_mod_rs index a185de83633..0d9cad563ea 100644 --- a/devel/codex/patches/patch-codex-rs_core_src_config_mod_rs +++ b/devel/codex/patches/patch-codex-rs_core_src_config_mod_rs @@ -1,7 +1,7 @@ Index: codex-rs/core/src/config/mod.rs --- codex-rs/core/src/config/mod.rs.orig +++ codex-rs/core/src/config/mod.rs -@@ -3265,7 +3265,7 @@ impl Config { +@@ -3288,7 +3288,7 @@ impl Config { let review_model = override_review_model.or(cfg.review_model); diff --git a/devel/codex/patches/patch-codex-rs_core_src_tools_handlers_multi_agents_common_rs b/devel/codex/patches/patch-codex-rs_core_src_tools_handlers_multi_agents_common_rs index 3dac4f260ab..4d7ac58965c 100644 --- a/devel/codex/patches/patch-codex-rs_core_src_tools_handlers_multi_agents_common_rs +++ b/devel/codex/patches/patch-codex-rs_core_src_tools_handlers_multi_agents_common_rs @@ -1,7 +1,7 @@ Index: codex-rs/core/src/tools/handlers/multi_agents_common.rs --- codex-rs/core/src/tools/handlers/multi_agents_common.rs.orig +++ codex-rs/core/src/tools/handlers/multi_agents_common.rs -@@ -262,6 +262,7 @@ pub(crate) fn apply_spawn_agent_runtime_overrides( +@@ -263,6 +263,7 @@ pub(crate) fn apply_spawn_agent_runtime_overrides( FunctionCallError::RespondToModel(format!("approval_policy is invalid: {err}")) })?; config.permissions.shell_environment_policy = turn.shell_environment_policy.clone();