From d2a990b5c903e02ba248004b9edecbce499fc5e4 Mon Sep 17 00:00:00 2001 From: "Can H. Tartanoglu" Date: Tue, 5 May 2026 10:28:39 +0200 Subject: [PATCH] codex-acp: 0.12.0 -> 0.13.0 --- pkgs/by-name/co/codex-acp/package.nix | 20 +++++++++++--------- pkgs/by-name/co/codex-acp/update.sh | 14 +++++++++++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index 04b17ef411ac..e32beee8a39f 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -11,9 +11,9 @@ librusty_v8 ? callPackage ./librusty_v8.nix { }, }: let - # codex-acp 0.12.0 pins openai/codex rust-v0.124.0 in Cargo.lock. - codexRev = "e9fb49366c93a1478ec71cc41ecee415a197d036"; - codexHash = "sha256-YFnzzwCm9/b30qLDMbkf/rEizuTjeqdCgoBZeS0wNBo="; + # codex-acp 0.13.0 pins openai/codex rust-v0.128.0 in Cargo.lock. + codexRev = "e4310be51f617f5e60382038fa9cbf53a2429ca4"; + codexHash = "sha256-v2W0eslPOPHxHX76+bnkE/f4y+MnQuopeOoAC5X16TA="; codexSrc = fetchFromGitHub { owner = "openai"; repo = "codex"; @@ -23,21 +23,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "codex-acp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "zed-industries"; repo = "codex-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-qPqg95FpXHBtyHBJtrfJUwu9GokfmOJgKgqLKQ48u+8="; + hash = "sha256-8Mz3xPhGSjaucZ9c0etGOe4JJC8vJhGFOnAhkwXmhyY="; }; - cargoHash = "sha256-/BZ82qiTy/mPwhf5v5CFrNSB6AxCRFdmHB72L0+KjJw="; + cargoHash = "sha256-kneMay6MGXhHA0q/usKsLFs/YKmdSHmrgSthzhaPgbk="; - # fetchCargoVendor only keeps the individual git crate subtrees, so restore - # the workspace-root file that codex-core includes via ../../../../node-version.txt. + # fetchCargoVendor only keeps the individual git crate subtrees. Older Codex + # crates included this workspace-root file from codex-core. postPatch = '' - cp ${codexSrc}/codex-rs/node-version.txt "$cargoDepsCopy/source-git-0/node-version.txt" + if [ -e ${codexSrc}/codex-rs/node-version.txt ]; then + cp ${codexSrc}/codex-rs/node-version.txt "$cargoDepsCopy/source-git-0/node-version.txt" + fi ''; env = { diff --git a/pkgs/by-name/co/codex-acp/update.sh b/pkgs/by-name/co/codex-acp/update.sh index 401c252abe13..2a8328e7bcf5 100755 --- a/pkgs/by-name/co/codex-acp/update.sh +++ b/pkgs/by-name/co/codex-acp/update.sh @@ -88,7 +88,15 @@ update_codex_pins() { local tmp tmp="$(mktemp)" - awk -v codex_rev="$CODEX_REV" -v codex_hash="$CODEX_HASH" ' + awk \ + -v latest_version="$latest_version" \ + -v codex_tag="$CODEX_TAG" \ + -v codex_rev="$CODEX_REV" \ + -v codex_hash="$CODEX_HASH" ' + /# codex-acp [^ ]+ pins openai\/codex rust-v[0-9.]+ in Cargo.lock\./ { + comment_count++ + sub(/# codex-acp [^ ]+ pins openai\/codex rust-v[0-9.]+ in Cargo.lock\./, "# codex-acp " latest_version " pins openai/codex " codex_tag " in Cargo.lock.") + } /codexRev = "[0-9a-f]+";/ { rev_count++ sub(/codexRev = "[0-9a-f]+";/, "codexRev = \"" codex_rev "\";") @@ -99,6 +107,10 @@ update_codex_pins() { } { print } END { + if (comment_count != 1) { + print "Failed to update codex pin comment in package.nix" > "/dev/stderr" + exit 1 + } if (rev_count != 1) { print "Failed to update codexRev in package.nix" > "/dev/stderr" exit 1