diff options
| author | Danny Milosavljevic <dannym@friendly-machines.com> | 2026-03-13 10:45:01 +0000 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@friendly-machines.com> | 2026-03-14 05:01:53 +0100 |
| commit | ad9ca26606c5a5c12ddf51544983dffd665846d2 (patch) | |
| tree | d299f452eb49c033a52db649f100a55f3ae1ada5 /gnu/packages/rust-apps.scm | |
| parent | 54225ed9ea6780faf35dbb98b7d6503f7f36d5db (diff) | |
gnu: codex, codex-acp: Drop file_lock patches; enable network-proxy.
* gnu/packages/patches/rust-codex-0.98.0-arg0-file-lock.patch,
gnu/packages/patches/rust-codex-0.98.0-core-file-lock.patch,
gnu/packages/patches/rust-codex-0.98.0-execpolicy-file-lock.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister them.
* gnu/packages/rust-sources.scm (rust-codex-0.0.0.785c0c43)[source]<patches>:
Remove file-lock patches.
(rust-codex-0.98.0)[source]<patches>: Likewise.
[arguments]<#:cargo-package-crates>: Add
codex-network-proxy.
* gnu/packages/rust-apps.scm (codex)[source]<patches>: Remove file-lock
patches.
[arguments]<#:cargo-install-paths>: Add network-proxy.
<#:cargo-package-crates>: Add codex-network-proxy.
(codex-acp)[arguments]<#:rust>: Delete.
<#:cargo-test-flags>: Remove override.
* gnu/packages/patches/codex-0.98.0-remove-patch-sections.patch: Stop
excluding network-proxy from workspace members.
Change-Id: Iabc65a4ca2e8cc5801933a74a2b53b9bce404102
Diffstat (limited to 'gnu/packages/rust-apps.scm')
| -rw-r--r-- | gnu/packages/rust-apps.scm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index fadc8dfa71c..827e778c938 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -845,9 +845,6 @@ Commit and SemVer specifications.") (origin (inherit (package-source rust-codex-0.98.0)) (patches (search-patches - "rust-codex-0.98.0-execpolicy-file-lock.patch" - "rust-codex-0.98.0-core-file-lock.patch" - "rust-codex-0.98.0-arg0-file-lock.patch" "codex-0.98.0-remove-patch-sections.patch" "rust-codex-0.98.0-test-shebangs.patch" "rust-codex-0.98.0-test-timeout.patch")))) @@ -856,7 +853,7 @@ Commit and SemVer specifications.") (list #:install-source? #f #:cargo-install-paths '(list "cli" "exec" "exec-server" - "linux-sandbox" "mcp-server" + "linux-sandbox" "mcp-server" "network-proxy" "app-server" "tui") ;; schema_fixtures_match_generated (upstream fixture is stale: ;; FileChange::Update in codex-protocol gained old_content, @@ -1042,7 +1039,7 @@ Commit and SemVer specifications.") "codex-exec" "codex-exec-server" "codex-stdio-to-uds" - ;; codex-network-proxy requires rama which needs Rust 1.91+. + "codex-network-proxy" "codex-chatgpt" "codex-cloud-tasks-client" ;;; Tier 5. @@ -1148,7 +1145,10 @@ Commit and SemVer specifications.") (lambda _ (setenv "HOME" "/tmp") (setenv "USER" "nixbld")))))) - (native-inputs (list perl python-minimal ;for tests + (native-inputs (list clang ;bindgen uses libclang to parse BoringSSL's C headers + cmake-minimal ;BoringSSL is compiled from C source + libunwind ;BoringSSL tests verify stack unwinding in assembly + perl python-minimal ;for tests pkg-config)) (inputs (cons* bash-minimal coreutils git-minimal sed openssl sqlite `(,zstd "lib") @@ -1180,11 +1180,7 @@ Configure providers via @file{~/.codex/config.toml}.") (build-system cargo-build-system) (arguments (list - #:rust rust-1.88 #:install-source? #f - ;; Skip doctests (--doc) because rustdoc is unavailable for non-default - ;; Rust versions in Guix. - #:cargo-test-flags '(list "--lib" "--bins" "--tests") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-codex-deps |